Add failsafe

ICTU · Nov 8, 2024 · df31270 · df31270
1 parent f01914d
commit df31270
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -34,4 +34,4 @@ jobs:
         run: |
           export CONTAINER_TAG="${{ steps.semver.outputs.version }}${{ matrix.env.IMAGE_SUFFIX }}"
           docker build --build-arg="IMAGE_EDITION=${{ matrix.env.IMAGE_EDITION }}" -t ictu/sonar:${CONTAINER_TAG} .
-          docker push ictu/sonar:${CONTAINER_TAG}
+          echo "Would run: docker push ictu/sonar:${CONTAINER_TAG}"
diff --git a/.github/workflows/helm-chart.yml b/.github/workflows/helm-chart.yml
@@ -41,17 +41,17 @@ jobs:
 
       - name: Build and run chart
         run: |
-          docker build --build-arg="IMAGE_EDITION=${{ matrix.env.IMAGE_EDITION }}" -t ci .
+          docker build --build-arg="IMAGE_EDITION=${{ matrix.env.IMAGE_EDITION }}" -t ictu/sonar:ci-latest .
           eval $(minikube -p minikube docker-env)
           kubectl apply -f helm/deploy-ci.yaml
           helm dependency build helm
-          helm upgrade --install --render-subchart-notes ictu-sonarqube helm
+          helm upgrade --set-json='sonarqube.image.tag="ci-latest"' --install --render-subchart-notes ictu-sonarqube helm
 
       - name: Wait for Sonar instance to start
         # profile for language 'web' is the last; assume everything is working if we got this far
         run: |
           eval $(minikube -p minikube docker-env)
-          kubectl wait --all pods --timeout=4m --for=condition=Ready
+          kubectl wait --all pods --timeout=5m --for=condition=Ready
           kubectl wait --all statefulsets --timeout=30s --for=jsonpath=status.availableReplicas=1
           kubectl logs -f pod/ictu-sonarqube-sonarqube-0 |& sed "/Current profile for language 'web' is 'Sonar way'/ q"
-        timeout-minutes: 5
+        timeout-minutes: 6