diff --git a/.github/workflows/integrated-test.yml b/.github/workflows/integrated-test.yml index 26b38dda97..fdac3aff9f 100644 --- a/.github/workflows/integrated-test.yml +++ b/.github/workflows/integrated-test.yml @@ -63,9 +63,9 @@ jobs: username: ${{ github.event.comment.user.login }} password: ${{ secrets.GITHUB_TOKEN }} - name: Pull cryostat image - run: podman pull ghcr.io/${{ github.repository_owner }}/cryostat:pr-${{ inputs.checkout-repo }}-${{ inputs.checkout-ref }}-linux-${{ inputs.build-arch }} + run: podman pull ghcr.io/${{ github.repository_owner }}/cryostat:pr-${{ inputs.pr-number }}-${{ inputs.sha-value }}-linux-${{ inputs.build-arch }} - name: retag image as quay - run: podman tag ghcr.io/${{ github.repository_owner }}/cryostat:pr-${{ inputs.checkout-repo }}-${{ inputs.checkout-ref }}-linux-${{ inputs.build-arch}} quay.io/cryostat/cryostat + run: podman tag ghcr.io/${{ github.repository_owner }}/cryostat:pr-${{ inputs.pr-number }}-${{ inputs.sha-value }}-linux-${{ inputs.build-arch}} quay.io/cryostat/cryostat - name: Run integration tests run: POD_NAME=cryostat-itests CONTAINER_NAME=cryostat-itest ITEST_IMG_VERSION=latest bash repeated-integration-tests.bash env: diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 8a7d8be7d2..cddb382f71 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -184,8 +184,8 @@ jobs: uses: ./.github/workflows/integrated-test.yml with: build-arch: ${{ matrix.arch }} - checkout-repo: ${{ needs.checkout-branch.outputs.PR_repo }} - checkout-ref: ${{ needs.checkout-branch.outputs.PR_head_ref }} + pr-number: ${{ github.event.issue.number }} + sha-value: ${{ needs.checkout-branch.outputs.PR_head_sha }} skip-itests: ${{ matrix.arch == 'arm64' }} retest-integration: @@ -197,8 +197,8 @@ jobs: uses: ./.github/workflows/integrated-test.yml with: build-arch: ${{ matrix.arch }} - checkout-repo: ${{ needs.checkout-branch.outputs.PR_repo }} - checkout-ref: ${{ needs.checkout-branch.outputs.PR_head_ref }} + pr-number: ${{ github.event.issue.number }} + sha-value: ${{ needs.checkout-branch.outputs.PR_head_sha }} skip-itests: ${{ matrix.arch == 'arm64' }} integration-test-pass: