refactor

moondance-labs · Feb 17, 2025 · 6b38f9f · 6b38f9f
1 parent d99f42a
commit 6b38f9f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 84 deletions.
diff --git a/.github/workflows/enforce-pr-labels.yml b/.github/workflows/enforce-pr-labels.yml
@@ -26,12 +26,4 @@ jobs:
         with:
           REQUIRED_LABELS_ANY: "D1-audited👍,D5-nicetohaveaudit⚠️,D9-needsaudit👮,D2-notlive,D3-trivial"
           REQUIRED_LABELS_ALL: ""
-          BANNED_LABELS: ""
-  enforce-ready-to-merge-label:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: yogevbd/[email protected]
-        with:
-          REQUIRED_LABELS_ANY: "A8-mergeoncegreen"
-          REQUIRED_LABELS_ALL: ""
           BANNED_LABELS: ""
diff --git a/.github/workflows/merge-when-ready.yml b/.github/workflows/merge-when-ready.yml
@@ -68,6 +68,40 @@ jobs:
               with:
                   name: binaries
                   path: binaries
+    zombienet-tests-ready-to-merge:
+        needs: ["enforce-ready-to-merge-label", "build"]
+        runs-on: self-hosted   
+        strategy:
+            fail-fast: false
+            matrix:
+                test_name:
+                    - zombie_tanssi_warp_sync
+                    - zombie_data_preservers
+                    - zombie_tanssi_parathreads
+                    - zombie_tanssi_rotation
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+              with:
+                  ref: ${{ github.head_ref }}
+            - name: "Download binaries"
+              uses: actions/download-artifact@v4
+              with:
+                  name: binaries
+                  path: target/release
+            - name: "Make binaries executable"
+              shell: bash
+              run: |
+                  chmod uog+x target/release/tanssi-node
+                  chmod uog+x target/release/tanssi-relay
+                  chmod uog+x target/release/tanssi-relay-prepare-worker
+                  chmod uog+x target/release/tanssi-relay-execute-worker
+                  chmod uog+x target/release/container-chain-simple-node
+                  chmod uog+x target/release/container-chain-frontier-node
+            - name: Run Zombienet Test ${{ matrix.test_name }}
+              uses: ./.github/workflow-templates/zombienet-tests
+              with:
+                  test_name: ${{ matrix.test_name }}
     e2e-bridge-test:
         needs: ["enforce-ready-to-merge-label", "build"]
         runs-on: self-hosted

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -668,82 +668,6 @@ jobs:
               with:
                   test_name: ${{ matrix.test_name }}
 
-    zombienet-tests-merge-queue:
-        if: ${{ github.event_name == 'merge_group' }}
-        runs-on: self-hosted
-        needs: ["set-tags", "build"]
-        strategy:
-            fail-fast: false
-            matrix:
-                test_name:
-                    - zombie_tanssi_warp_sync
-                    - zombie_data_preservers
-                    - zombie_tanssi_parathreads
-                    - zombie_tanssi_rotation
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-              with:
-                  ref: ${{ needs.set-tags.outputs.git_ref }}
-            - name: "Download binaries"
-              uses: actions/download-artifact@v4
-              with:
-                  name: binaries
-                  path: target/release
-            - name: "Make binaries executable"
-              shell: bash
-              run: |
-                  chmod uog+x target/release/tanssi-node
-                  chmod uog+x target/release/tanssi-relay
-                  chmod uog+x target/release/tanssi-relay-prepare-worker
-                  chmod uog+x target/release/tanssi-relay-execute-worker
-                  chmod uog+x target/release/container-chain-simple-node
-                  chmod uog+x target/release/container-chain-frontier-node
-            - name: Run Zombienet Test ${{ matrix.test_name }}
-              uses: ./.github/workflow-templates/zombienet-tests
-              with:
-                  test_name: ${{ matrix.test_name }}
-
-    zombienet-merge-queue-results:
-        if: ${{ always() }}
-        runs-on: ubuntu-latest
-        name: Results for zombienet-tests-merge-queue
-        needs: [zombienet-tests-merge-queue]
-        steps:
-            - run: |
-                  result="${{ needs.zombienet-tests-merge-queue.result}}"
-                  if [[ $result == "success" || $result == "skipped" ]]; then
-                      exit 0
-                  else
-                      exit 1
-                  fi
-
-    zombienet-tests-merge-queue-bridge-e2e:
-        if: ${{ github.event_name == 'merge_group' }}
-        runs-on: self-hosted
-        needs: ["set-tags", "build"]
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-              with:
-                  ref: ${{ needs.set-tags.outputs.git_ref }}
-            - name: "Download binaries"
-              uses: actions/download-artifact@v4
-              with:
-                  name: binaries
-                  path: target/release
-            - name: "Make binaries executable"
-              shell: bash
-              run: |
-                  chmod uog+x target/release/tanssi-node
-                  chmod uog+x target/release/tanssi-relay
-                  chmod uog+x target/release/tanssi-relay-prepare-worker
-                  chmod uog+x target/release/tanssi-relay-execute-worker
-                  chmod uog+x target/release/container-chain-simple-node
-                  chmod uog+x target/release/container-chain-frontier-node
-            - name: Run Zombienet Test ${{ matrix.test_name }}
-              uses: ./.github/workflow-templates/bridge-e2e
-
     chopsticks-upgrade-test:
         runs-on:
             labels: ubuntu-latest