Split integration tests from blocking the merge queue (#496)

nfx · web-flow · commit 2d166bd72f43 · 2023-10-23T21:21:16.000+02:00
There were many cases when GitHub bot was removing PR from the merge
queue, possibly because of integration tests being flaky. This PR
removes the chance of this flakiness by partitioning the integration
tests into its own workflow file.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -0,0 +1,53 @@
+name: acceptance
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+permissions:
+  id-token: write
+  contents: read
+  pull-requests: write
+
+env:
+  HATCH_VERSION: 1.7.0
+
+jobs:
+  integration:
+    if: github.event_name == 'pull_request'
+    environment: account-admin
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2.5.0
+
+      - name: Unshallow
+        run: git fetch --prune --unshallow
+
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          cache: 'pip'
+          cache-dependency-path: '**/pyproject.toml'
+          python-version: '3.10'
+
+      - name: Install hatch
+        run: pip install hatch==$HATCH_VERSION
+
+      - uses: azure/login@v1
+        with:
+          client-id: ${{ secrets.ARM_CLIENT_ID }}
+          tenant-id: ${{ secrets.ARM_TENANT_ID }}
+          subscription-id: ${{ secrets.ARM_SUBSCRIPTION_ID }}
+
+      - name: Run integration tests
+        run: hatch run integration:test
+        env:
+          CLOUD_ENV: "${{ vars.CLOUD_ENV }}"
+          DATABRICKS_HOST: "${{ secrets.DATABRICKS_HOST }}"
+          DATABRICKS_ACCOUNT_ID: "${{ secrets.DATABRICKS_ACCOUNT_ID }}"
+          DATABRICKS_CLUSTER_ID: "${{ vars.DATABRICKS_CLUSTER_ID }}"
+          TEST_DEFAULT_CLUSTER_ID: "${{ vars.TEST_DEFAULT_CLUSTER_ID }}"
+          TEST_DEFAULT_WAREHOUSE_ID: "${{ vars.TEST_DEFAULT_WAREHOUSE_ID }}"
+          TEST_INSTANCE_POOL_ID: "${{ vars.TEST_INSTANCE_POOL_ID }}"
+          TEST_LEGACY_TABLE_ACL_CLUSTER_ID: "${{ vars.TEST_LEGACY_TABLE_ACL_CLUSTER_ID }}"
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -14,11 +14,6 @@ on:
     branches:
       - main
 
-permissions:
-  id-token: write
-  contents: read
-  pull-requests: write
-
 env:
   HATCH_VERSION: 1.7.0
 
@@ -48,45 +43,6 @@ jobs:
       - name: Publish test coverage
         uses: codecov/codecov-action@v1
 
-  integration:
-    if: github.event_name == 'pull_request'
-    environment: account-admin
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2.5.0
-
-      - name: Unshallow
-        run: git fetch --prune --unshallow
-
-      - name: Install Python
-        uses: actions/setup-python@v4
-        with:
-          cache: 'pip'
-          cache-dependency-path: '**/pyproject.toml'
-          python-version: '3.10'
-
-      - name: Install hatch
-        run: pip install hatch==$HATCH_VERSION
-
-      - uses: azure/login@v1
-        with:
-          client-id: ${{ secrets.ARM_CLIENT_ID }}
-          tenant-id: ${{ secrets.ARM_TENANT_ID }}
-          subscription-id: ${{ secrets.ARM_SUBSCRIPTION_ID }}
-
-      - name: Run integration tests
-        run: hatch run integration:test
-        env:
-          CLOUD_ENV: "${{ vars.CLOUD_ENV }}"
-          DATABRICKS_HOST: "${{ secrets.DATABRICKS_HOST }}"
-          DATABRICKS_ACCOUNT_ID: "${{ secrets.DATABRICKS_ACCOUNT_ID }}"
-          DATABRICKS_CLUSTER_ID: "${{ vars.DATABRICKS_CLUSTER_ID }}"
-          TEST_DEFAULT_CLUSTER_ID: "${{ vars.TEST_DEFAULT_CLUSTER_ID }}"
-          TEST_DEFAULT_WAREHOUSE_ID: "${{ vars.TEST_DEFAULT_WAREHOUSE_ID }}"
-          TEST_INSTANCE_POOL_ID: "${{ vars.TEST_INSTANCE_POOL_ID }}"
-          TEST_LEGACY_TABLE_ACL_CLUSTER_ID: "${{ vars.TEST_LEGACY_TABLE_ACL_CLUSTER_ID }}"
-
   fmt:
     runs-on: ubuntu-latest
     steps:
