wip

hazelcast · Nov 5, 2024 · 88084c6 · 88084c6
1 parent 3cbedf8
commit 88084c6
Showing 1 changed file with 21 additions and 20 deletions.
diff --git a/.github/workflows/test_published_images.yml b/.github/workflows/test_published_images.yml
@@ -91,7 +91,8 @@ jobs:
           username: ${{ env.REDHAT_CATALOG_REGISTRY_CONNECT_ROBOT_USERNAME }}
           password: ${{ env.REDHAT_CATALOG_REGISTRY_CONNECT_ROBOT_PASSWORD }}
 
-      - name: Setup smoke test
+      - name: Run smoke test against image
+        timeout-minutes: 10
         run: |
           set -o errexit -o nounset -o pipefail ${RUNNER_DEBUG:+-x}
 
@@ -137,25 +138,25 @@ jobs:
             tag_elements+=("${{ matrix.jdk }}")
           fi
 
-      - name: Run smoke test against Docker registry image
-        timeout-minutes: 2
-        run: simple-smoke-test hazelcast "${image_name}"
-
-      - name: Run smoke test against NLC image
-        # Check additional EE repos
-        # Only populated for default variant, not "slim"
-        # NLC repo only populated for absolute versions - not "latest", "latest-lts" etc tags
-        # Identify absolute version based on earlier parsing of version number
-        if: ${{ matrix.distribution_type == 'ee' && matrix.variant == '' && steps.version.outputs.major != '' }}
-        timeout-minutes: 2
-        run: simple-smoke-test "${{ secrets.NLC_REPOSITORY }}/hazelcast_cloud" "hazelcast-nlc"
-
-      - name: Run smoke test OCP image
-        # Check additional EE repos
-        # Only populated for default variant, not "slim"
-        if: ${{ matrix.distribution_type == 'ee' && matrix.variant == '' }}
-        timeout-minutes: 2
-        run: simple-smoke-test "registry.connect.redhat.com/hazelcast/hazelcast-enterprise-${{ steps.version.outputs.major }}-rhel8" "${image_name}"
+          echo "Testing Docker registry"
+          simple-smoke-test hazelcast "${image_name}"
+
+          # Check additional EE repos
+          # Only populated for default variant, not "slim"
+          if [[ "${{ matrix.distribution_type }}" == "ee" && -z "${{ matrix.variant }}" ]]; then
+            # NLC repo only populated for absolute versions - not "latest", "latest-lts" etc tags
+            # Identify absolute version based on earlier parsing of version number
+            if [[ -n "${{ steps.version.outputs.major }}" ]]; then
+              echo "Testing NLC"
+              simple-smoke-test "${{ secrets.NLC_REPOSITORY }}/hazelcast_cloud" "hazelcast-nlc"
+            fi
+
+            # TODO REMOVE
+            printenv
+
+            echo "Testing OCP"
+            simple-smoke-test "registry.connect.redhat.com/hazelcast/hazelcast-enterprise-${{ steps.version.outputs.major }}-rhel8" "${image_name}"
+          fi
 
       - name: Get docker logs
         if: ${{ failure() }}