testing9

aali309 · Oct 24, 2023 · bd0d05a · bd0d05a
1 parent 58fccb8
commit bd0d05a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 24 deletions.
diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml
@@ -92,13 +92,3 @@ jobs:
     - uses: skjolber/maven-cache-github-action@v1
       with:
         step: save
-
-  integration-tests:
-    needs: [build-image]
-    if: ${{ !inputs.skip-itests && !inputs.run-tests-only }}
-    strategy:
-      matrix:
-        arch: [amd64, arm64]
-    uses: ./.github/workflows/integrated-test.yml
-    with:
-      build-arch: ${{ matrix.arch }}
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
@@ -92,10 +92,21 @@ jobs:
             body: commentBody
           });
 
+  build-image:
+    needs: [checkout-branch]
+    if: github.event.issue.pull_request && startsWith(github.event.comment.body, '/build_test')
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
+    uses: ./.github/workflows/ci-build-image.yml
+    with:
+      build-arch: ${{ matrix.arch }}
+      checkout-repo: ${{ needs.checkout-branch.outputs.PR_repo }}
+      checkout-ref: ${{ needs.checkout-branch.outputs.PR_head_ref  }}
+
   push-to-ghcr:
     runs-on: ubuntu-latest
-    if: startsWith(github.event.comment.body, '/build_test')
-    needs: [checkout-branch]
+    needs: [checkout-branch, build-image]
     strategy:
       matrix:
         arch: [amd64, arm64]
@@ -135,7 +146,6 @@ jobs:
 
   comment-image:
     runs-on: ubuntu-latest
-    if: github.event.issue.pull_request && startsWith(github.event.comment.body, '/build_test')
     needs: [push-to-ghcr]
     env:
       amd64_image: ${{ needs.push-to-ghcr.outputs.amd64_image }}
@@ -165,20 +175,17 @@ jobs:
           CRYOSTAT_IMAGE=${{ env.arm64_image }} sh smoketest.sh
           ```
 
-  build-and-test:
-    needs: [code-analysis, checkout-branch]
-    if: github.event.issue.pull_request && startsWith(github.event.comment.body, '/build_test')
+  integration-test:
+    needs: [checkout-branch, push-to-ghcr]
     strategy:
       matrix:
         arch: [amd64, arm64]
-    uses: ./.github/workflows/ci-build-image.yml
+    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  }}
-      skip-itests: ${{ matrix.arch != 'amd64' }}
-
-# Add a new step to use /retest
+      pr-number: ${{ github.event.issue.number }}
+      sha-value: ${{ needs.checkout-branch.outputs.PR_head_sha }}
+
   retest-integration:
     needs: [checkout-branch]
     if: contains(github.event.comment.body, '/retest')
@@ -191,9 +198,9 @@ jobs:
       pr-number: ${{ github.event.issue.number }}
       sha-value: ${{ needs.checkout-branch.outputs.PR_head_sha }}
 
-  build-and-test-pass:
+  integration-test-pass:
     runs-on: ubuntu-latest
-    needs: [build-and-test]
+    needs: [build-image]
     steps:
     - name: Leave Actions Run Comment
       uses: actions/github-script@v6