test github env

qdrvm · May 21, 2024 · a6138a2 · a6138a2
1 parent 492222c
commit a6138a2
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 28 deletions.
diff --git a/.github/workflows/zombie-tests.yaml b/.github/workflows/zombie-tests.yaml
@@ -7,9 +7,6 @@
 name: Zombie-Tests
 
 on:
-  push:
-    branches:
-      - "test/polkadot-functional-zombietests"
   workflow_dispatch: 
 
 jobs:
@@ -20,37 +17,42 @@ jobs:
         options:
           - name: "PVF preparation & execution time"
             test: "test-polkadot-functional-0001-parachains-pvf"
-          - name: "Disputes initiation, conclusion and lag"
-            test: "test-polkadot-functional-0002-parachains-disputes"
-          - name: "BEEFY voting and finality, test MMR proofs. Assumes Rococo sessions of 1 minute"
-            test: "test-polkadot-functional-0003-beefy-and-mmr"
-          - name: "Dispute finality lag when 1/3 of parachain validators always attempt to include an invalid block"
-            test: "test-polkadot-functional-0004-parachains-garbage-candidate"
-          - name: "Past-session dispute slashing"
-            test: "test-polkadot-functional-0005-parachains-disputes-past-session"
-          - name: "Test if parachains make progress with most of approvals being tranch0"
-            test: "test-polkadot-functional-0006-parachains-max-tranche0"
-          - name: "Test if disputes triggered on finalized blocks within scope always end as valid"
-            test: "test-polkadot-functional-0007-dispute-freshly-finalized"
-          - name: "Test if disputes triggered on finalized blocks out of scope never get to be confirmed and concluded"
-            test: "test-polkadot-functional-0008-dispute-old-finalized"
-          - name: "Approval voting coalescing does not lag finality"
-            test: "test-polkadot-functional-0009-approval-voting-coalescing"
-          - name: "Test validator disabling effects"
-            test: "test-polkadot-functional-0010-validator-disabling"
-          - name: "Test we are producing blocks at 6 seconds clip"
-            test: "test-polkadot-functional-0011-async-backing-6-seconds-rate"
+#          - name: "Disputes initiation, conclusion and lag"
+#            test: "test-polkadot-functional-0002-parachains-disputes"
+#          - name: "BEEFY voting and finality, test MMR proofs. Assumes Rococo sessions of 1 minute"
+#            test: "test-polkadot-functional-0003-beefy-and-mmr"
+#          - name: "Dispute finality lag when 1/3 of parachain validators always attempt to include an invalid block"
+#            test: "test-polkadot-functional-0004-parachains-garbage-candidate"
+#          - name: "Past-session dispute slashing"
+#            test: "test-polkadot-functional-0005-parachains-disputes-past-session"
+#          - name: "Test if parachains make progress with most of approvals being tranch0"
+#            test: "test-polkadot-functional-0006-parachains-max-tranche0"
+#          - name: "Test if disputes triggered on finalized blocks within scope always end as valid"
+#            test: "test-polkadot-functional-0007-dispute-freshly-finalized"
+#          - name: "Test if disputes triggered on finalized blocks out of scope never get to be confirmed and concluded"
+#            test: "test-polkadot-functional-0008-dispute-old-finalized"
+#          - name: "Approval voting coalescing does not lag finality"
+#            test: "test-polkadot-functional-0009-approval-voting-coalescing"
+#          - name: "Test validator disabling effects"
+#            test: "test-polkadot-functional-0010-validator-disabling"
+#          - name: "Test we are producing blocks at 6 seconds clip"
+#            test: "test-polkadot-functional-0011-async-backing-6-seconds-rate"
     runs-on: [ actions-runner-controller ]
     timeout-minutes: 60
-    env:
-      BRANCH_NAME: ${{ github.head_ref }}
     steps:
       - name: Set owner of working dir recurively
         run: sudo chown -R $(whoami) .
       - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
+      - name: Extract branch name
+        shell: bash
+        run: |
+          branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
+          echo "branch=${branch}" >> $GITHUB_OUTPUT
+          echo "Branch name: ${branch}"
+        id: extract_branch
       - name: build zombie-tester
         working-directory: ./zombienet/docker
-        run: make tester BRANCH_NAME=${{ env.BRANCH_NAME }}
+        run: make tester BRANCH_NAME=${{ steps.extract_branch.outputs.branch }}
       - name: Run test
         working-directory: ./zombienet/docker
         run: make ${{ matrix.options.test }}
diff --git a/zombienet/docker/Makefile b/zombienet/docker/Makefile
@@ -1,3 +1,5 @@
+BRANCH_NAME ?= master
+
 builder_last:
 	python version.py https://github.com/paritytech/polkadot-sdk && \
 	python version.py https://github.com/paritytech/zombienet && \

diff --git a/zombienet/docker/tester.Dockerfile b/zombienet/docker/tester.Dockerfile
@@ -5,8 +5,7 @@ FROM qdrvm/kagome:latest as kagome
 
 FROM qdrvm/zombie-builder:$POLKADOT_SDK_RELEASE AS tester
 COPY --from=kagome /usr/local/bin/kagome /home/nonroot/bin
-RUN echo ${BRANCH_NAME}
-RUN git clone https://github.com/qdrvm/kagome.git -b ${BRANCH_NAME}
+RUN git clone https://github.com/qdrvm/kagome.git -b "$BRANCH_NAME"
 
 # TODO(kamilsa): #2099 Remove this once we have a proper way to precompile
 RUN mkdir /tmp/kagome/