Code review changes

hpcc-systems · Jan 19, 2024 · 547e114 · 547e114
1 parent 92c9c82
commit 547e114
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/actions/deploy-hpcc-k8s/action.yaml b/.github/actions/deploy-hpcc-k8s/action.yaml
@@ -46,6 +46,7 @@ runs:
         kubectl wait pods --for=jsonpath='{.status.phase}'=Running -l app=registry -n container-registry --timeout=90s
       shell: bash
 
+    # Note: We need to move the package file due to the Dockerfile expecting it in the platform folder
     - name: Find & Move Package
       run: |
         k8s_pkg_path=$(ls -t ./${{ inputs.asset-name }}/*.deb 2>/dev/null | head -1)
@@ -146,12 +147,11 @@ runs:
         sudo microk8s helm install myhpcc ${{ inputs.platform-folder }}/helm/hpcc --set global.image.root=localhost:32000/hpccsystems --set global.image.version=latest -f values.yaml
       shell: bash
 
-    - name: Wait for ECLWatch Startup
+    - name: Wait for Deployment Rollout & Grab Service IPs
       run: |
         sleep 10
-        echo "Waiting for ECLWatch startup" && kubectl wait --for=condition=ready pod --timeout=180s -l app=eclwatch
-        echo "Waiting for Rowservice startup" && kubectl wait --for=condition=ready pod --timeout=180s -l server=rowservice
-        echo "Waiting for SQL2ECL startup" && kubectl wait --for=condition=ready pod --timeout=180s -l app=sql2ecl
+        deploy=$(kubectl get deploy -o name)
+        for i in $deploy; do kubectl rollout status $i -w --timeout=180s; done
         echo "ECLWATCH_IP=$(kubectl get svc eclwatch -o jsonpath='{.spec.clusterIP}')" >> $GITHUB_ENV
         echo "ROWSERVICE_IP=$(kubectl get svc rowservice -o jsonpath='{.spec.clusterIP}')" >> $GITHUB_ENV
         echo "SQL_TO_ECL_IP=$(kubectl get svc sql2ecl -o jsonpath='{.spec.clusterIP}')" >> $GITHUB_ENV

diff --git a/.github/workflows/test-regression-suite-k8s.yml b/.github/workflows/test-regression-suite-k8s.yml
@@ -15,7 +15,8 @@ on:
         default: 'docker-ubuntu-22_04-containerized'
 
 jobs:
-  build-docker-ubuntu-22_04:
+  build-docker:
+    name: build-docker-${{ inputs.os }}
     if: ${{ contains('pull_request,push', github.event_name) }}
     uses: ./.github/workflows/build-docker.yml
     with:
@@ -27,7 +28,7 @@ jobs:
 
   main:
     name: K8s Regression Suite
-    needs: build-docker-ubuntu-22_04
+    needs: build-docker
     runs-on: ${{ inputs.os }}
     steps:
       - name: Checkout PR