test(itest): ensure correct latest built image is tested (cryostatio#…

…1572)

* test(itest): never pull Cryostat container from registry, require one present locally

* test(itest): use os/arch-specific image tag for testing

* test(run.sh): include image os/arch in default image to run

* remove bad image version override

.github/workflows/ci-build-image.yml

@@ -115,7 +115,7 @@ jobs:
       with:
         step: restore
     - name: Run integration tests
-      run: POD_NAME=cryostat-itests CONTAINER_NAME=cryostat-itest ITEST_IMG_VERSION=latest bash repeated-integration-tests.bash
+      run: POD_NAME=cryostat-itests CONTAINER_NAME=cryostat-itest bash repeated-integration-tests.bash
     - name: Print itest logs
       if: failure()
       run: ls -1dt target/cryostat-itest-*.log | head -n1 | xargs cat

pom.xml

@@ -550,6 +550,7 @@
             <executable>${imageBuilder}</executable>
             <arguments>
               <argument>run</argument>
+              <argument>--pull=never</argument>
               <argument>--pod=${cryostat.itest.podName}</argument>
               <argument>--name=${cryostat.itest.containerName}</argument>
               <argument>--health-cmd</argument>
@@ -614,7 +615,7 @@
               <argument>GRAFANA_DASHBOARD_URL=http://${cryostat.itest.webHost}:${cryostat.itest.grafana.port}</argument>
               <argument>--detach</argument>
               <argument>--rm</argument>
-              <argument>${cryostat.imageStream}:${cryostat.imageVersionLower}</argument>
+              <argument>${cryostat.imageStream}:${cryostat.imageVersionLower}-${build.os}-${build.arch}</argument>
             </arguments>
             <skip>${skipITs}</skip>
           </configuration>

run.sh

@@ -24,7 +24,7 @@ cleanup() {
 trap cleanup EXIT
 
 if [ -z "$CRYOSTAT_IMAGE" ]; then
-    CRYOSTAT_IMAGE="quay.io/cryostat/cryostat:$(${MVN} validate help:evaluate -o -B -q -DforceStdout -Dexpression=cryostat.imageVersionLower)"
+    CRYOSTAT_IMAGE="quay.io/cryostat/cryostat:$(${MVN} validate help:evaluate -o -B -q -DforceStdout -Dexpression=cryostat.imageVersionLower)-$(getPomProperty build.os)-$(getPomProperty build.arch)"
 fi
 
 printf "\n\nRunning %s ...\n\n", "$CRYOSTAT_IMAGE"