CI: merged install and test steps to see diagnostic details during in…

…stallation fail
TouK · Feb 27, 2025 · d32435b · d32435b
1 parent fcc8923
commit d32435b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/.github/workflows/helm-test-workflow.yaml b/.github/workflows/helm-test-workflow.yaml
@@ -80,10 +80,8 @@ jobs:
       - name: Set Nussknacker image version
         id: setNussknackerVersion
         run: '[[ $GITHUB_REF == refs/heads/release-* || $GITHUB_REF == refs/tags/release-* ]] && version=${GITHUB_REF##*/release-} && echo "Using version based on release branch/tag name: $version" && echo "nuVersion=$version" >> $GITHUB_OUTPUT || (echo "Using default version" && echo "nuVersion=${{env.NUSSKNACKER_VERSION}}" >> $GITHUB_OUTPUT)'
-      - name: helmUpgrade
-        run: helm upgrade -i "${{env.RELEASE_NAME}}" dist/*.tgz --version "${{needs.build.outputs.version}}"  --wait --debug -f deploy-values.yaml -f deploy-values-kafka-config.yaml --set "image.tag=${{steps.setNussknackerVersion.outputs.nuVersion}}_scala-2.12"
       - name: helmTestRelease
-        run: ./test.sh "${{env.RELEASE_NAME}}"
+        run: ./ci-deploy-verify.sh "${{needs.build.outputs.version}}"
   test-lite-postgres:
     name: test lite-k8s streaming deployment mode postgres
     runs-on: ubuntu-latest
@@ -105,10 +103,8 @@ jobs:
       - name: Set Nussknacker image version
         id: setNussknackerVersion
         run: '[[ $GITHUB_REF == refs/heads/release-* || $GITHUB_REF == refs/tags/release-* ]] && version=${GITHUB_REF##*/release-} && echo "Using version based on release branch/tag name: $version" && echo "nuVersion=$version" >> $GITHUB_OUTPUT || (echo "Using default version" && echo "nuVersion=${{env.NUSSKNACKER_VERSION}}" >> $GITHUB_OUTPUT)'
-      - name: helmUpgrade
-        run: helm upgrade -i "${{env.RELEASE_NAME}}" dist/*.tgz --version "${{needs.build.outputs.version}}" --wait --debug -f deploy-values.yaml -f deploy-values-kafka-config.yaml -f deploy-values-lite.yaml --set "image.tag=${{steps.setNussknackerVersion.outputs.nuVersion}}_scala-2.12"
       - name: helmTestRelease
-        run: ./test.sh "${{env.RELEASE_NAME}}"
+        run: ./ci-deploy-verify.sh "${{needs.build.outputs.version}}" -f deploy-values-lite.yaml
   test-lite-hsql:
     name: test lite-k8s streaming deployment hsql
     runs-on: ubuntu-latest
@@ -126,18 +122,8 @@ jobs:
           args: >-
             --config=.k3d/single-cluster.yml
             --trace
-      - name: helmUpgrade
-        run: |
-          helm upgrade -i "${{env.RELEASE_NAME}}" dist/*.tgz \
-            --version "${{needs.build.outputs.version}}" \
-            --wait --debug \
-            -f deploy-values.yaml \
-            -f deploy-values-kafka-config.yaml \
-            -f deploy-values-lite.yaml \
-            -f deploy-values-db-hsql.yaml \
-            --set "image.tag=${{env.NUSSKNACKER_VERSION}}"
       - name: helmTestRelease
-        run: ./test.sh "${{env.RELEASE_NAME}}"
+        run: ./ci-deploy-verify.sh "${{needs.build.outputs.version}}" -f deploy-values-lite.yaml -f deploy-values-db-hsql.yam
   publish-snapshot:
     name: publish-snapshot
     if: ${{ github.ref == 'refs/heads/main' || startsWith(github.head_ref, 'preview/') }}

diff --git a/test.sh → ci-deploy-verify.sh b/test.sh → ci-deploy-verify.sh
@@ -3,7 +3,7 @@
 set -e 
 set -x
 
-RELEASE=$1
+CHART_VERSION=$1
 
 function logOnExit {
     echo -e "\n\n\n\n\n"
@@ -27,4 +27,14 @@ function logOnExit {
 }
 trap 'logOnExit' EXIT
 
-helm test "$RELEASE" --timeout 10m0s
+echo "Installing helm chart"
+helm upgrade -i "$RELEASE_NAME" dist/*.tgz \
+  --version "$CHART_VERSION" \
+  --wait --debug \
+  -f deploy-values.yaml \
+  -f deploy-values-kafka-config.yaml \
+   $@ \
+  --set "image.tag=${NUSSKNACKER_VERSION}_scala-2.12"
+
+echo "Running tests"
+helm test "$RELEASE_NAME" --timeout 10m0s