diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d3933437f..270d6d44da 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -331,7 +331,7 @@ jobs: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 - name: build zombie-tester working-directory: ./zombienet/docker - run: make tester + run: make tester BRANCH_NAME=${{ github.head_ref }} - name: Run test working-directory: ./zombienet/docker run: make ${{ matrix.options.test }} diff --git a/.github/workflows/zombie-tests.yaml b/.github/workflows/zombie-tests.yaml index 243cafdcd1..a347dfa206 100644 --- a/.github/workflows/zombie-tests.yaml +++ b/.github/workflows/zombie-tests.yaml @@ -48,7 +48,7 @@ jobs: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 - name: build zombie-tester working-directory: ./zombienet/docker - run: make tester + run: make tester BRANCH_NAME=${{ github.head_ref }} - name: Run test working-directory: ./zombienet/docker run: make ${{ matrix.options.test }} diff --git a/zombienet/docker/Makefile b/zombienet/docker/Makefile index d21f710ee8..457c2748bc 100644 --- a/zombienet/docker/Makefile +++ b/zombienet/docker/Makefile @@ -35,10 +35,9 @@ tester: python3 version.py https://github.com/paritytech/polkadot-sdk && \ if [ -f polkadot-sdk-versions.txt ]; then \ POLKADOT_SDK_RELEASE=$$(grep 'polkadot_format_version:' polkadot-sdk-versions.txt | cut -d ' ' -f 2); \ - BRANCH_NAME="$(git rev-parse --abbrev-ref HEAD)" \ DOCKER_BUILDKIT=0 docker build --platform linux/amd64 --no-cache -t qdrvm/zombie-tester:latest -f tester.Dockerfile \ --build-arg POLKADOT_SDK_RELEASE=$$POLKADOT_SDK_RELEASE \ - --build-arg BRANCH_NAME=$$BRANCH_NAME . ; \ + --build-arg BRANCH_NAME=$(BRANCH_NAME) . ; \ else \ echo "One or more files are missing."; \ fi diff --git a/zombienet/docker/tester.Dockerfile b/zombienet/docker/tester.Dockerfile index 1eff04a8e6..3af5d47c14 100644 --- a/zombienet/docker/tester.Dockerfile +++ b/zombienet/docker/tester.Dockerfile @@ -5,7 +5,8 @@ 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 git clone https://github.com/qdrvm/kagome.git -b $BRANCH_NAME +RUN echo ${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/