testing18

aali309 · Oct 25, 2023 · 72f4a21 · 72f4a21
1 parent 9078a1b
commit 72f4a21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git 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:
@@ -76,4 +76,3 @@ jobs:
     - name: Print itest container logs
       if: failure()
       run: ls -1dt target/cryostat-*.server.log | head -n1 | xargs catyea
-#testing
diff --git 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: