test(itest): allow explicit override of itest image tag (#1574)

* test(itest): allow explicit override of itest image tag * default to testing latest image
cryostatio · Jul 1, 2023 · 0bb8d7a · 0bb8d7a
1 parent 5d6a533
commit 0bb8d7a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml
@@ -119,7 +119,7 @@ jobs:
       with:
         step: restore
     - name: Run integration tests
-      run: POD_NAME=cryostat-itests CONTAINER_NAME=cryostat-itest bash repeated-integration-tests.bash
+      run: POD_NAME=cryostat-itests CONTAINER_NAME=cryostat-itest ITEST_IMG_VERSION=latest bash repeated-integration-tests.bash
     - name: Print itest logs
       if: failure()
       run: ls -1dt target/cryostat-itest-*.log | head -n1 | xargs cat

diff --git a/pom.xml b/pom.xml
@@ -51,6 +51,7 @@
   <cryostat.itest.webHost>localhost</cryostat.itest.webHost>
   <cryostat.itest.podName>cryostat-itests</cryostat.itest.podName>
   <cryostat.itest.containerName>cryostat-itest</cryostat.itest.containerName>
+  <cryostat.itest.imageTag>${cryostat.imageVersionLower}-${build.os}-${build.arch}</cryostat.itest.imageTag>
   <cryostat.itest.grafana.containerName>grafana-itest</cryostat.itest.grafana.containerName>
   <cryostat.itest.grafana.port>3000</cryostat.itest.grafana.port>
   <cryostat.itest.grafana.imageStream>quay.io/cryostat/cryostat-grafana-dashboard</cryostat.itest.grafana.imageStream>
@@ -615,7 +616,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}-${build.os}-${build.arch}</argument>
+              <argument>${cryostat.imageStream}:${cryostat.itest.imageTag}</argument>
             </arguments>
             <skip>${skipITs}</skip>
           </configuration>

diff --git a/repeated-integration-tests.bash b/repeated-integration-tests.bash
@@ -33,8 +33,7 @@ if [ -z "${CONTAINER_NAME}" ]; then
 fi
 
 if [ -z "${ITEST_IMG_VERSION}" ]; then
-    ITEST_IMG_VERSION="$(getPomProperty version)"
-    ITEST_IMG_VERSION="${ITEST_IMG_VERSION,,}" # lowercase
+    ITEST_IMG_VERSION="latest"
 fi
 
 if [ -z "${PULL_IMAGES}" ]; then
@@ -43,7 +42,7 @@ fi
 
 STARTFLAGS=(
     "-DfailIfNoTests=true"
-    "-Dcryostat.imageVersion=${ITEST_IMG_VERSION}"
+    "-Dcryostat.itest.imageTag=${ITEST_IMG_VERSION}"
     "-Dcryostat.itest.pullImages=${PULL_IMAGES}"
     "build-helper:regex-property@image-tag-to-lower"
     "exec:exec@create-pod"