ci: rely on jupyterhub/action-k8s-await-workloads to await workloads

jupyterhub · Feb 1, 2021 · ad1d512 · ad1d512
1 parent 8b63e21
commit ad1d512
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/.github/workflows/test-chart.yaml b/.github/workflows/test-chart.yaml
@@ -150,9 +150,10 @@ jobs:
       # jupyterhub and the autohttps pod is about to start, so for CI
       # performance we delayed this until now and did other things in between.
       - name: Await local ACME server
-        run: |
-          . ./ci/common
-          await_pebble
+        uses: jupyterhub/action-k8s-await-workloads@v1
+        with:
+          timeout: 60
+          max-restarts: 0
 
       - name: "(Upgrade) Install ${{ matrix.upgrade-from }} chart"
         if: matrix.test == 'upgrade'
@@ -207,21 +208,32 @@ jobs:
               --post-renderer=ci/string-replacer.sh
 
       - name: "(Upgrade) Await ${{ matrix.upgrade-from }} chart"
+        if: matrix.test == 'upgrade'
+        uses: jupyterhub/action-k8s-await-workloads@v1
+        with:
+          timeout: 60
+          max-restarts: 0
+
+      - name: "(Upgrade) Await ${{ matrix.upgrade-from }} chart cert acquisition"
         if: matrix.test == 'upgrade'
         run: |
           . ./ci/common
-          await_jupyterhub
           await_autohttps_tls_cert_acquisition
           await_autohttps_tls_cert_save
 
       - name: "Install local chart"
         run: |
           helm upgrade --install jupyterhub ./jupyterhub --values dev-config.yaml
 
-      - name: Await local chart
+      - name: "Await local chart"
+        uses: jupyterhub/action-k8s-await-workloads@v1
+        with:
+          timeout: 60
+          max-restarts: 0
+
+      - name: Await local chart cert acquisition
         run: |
           . ./ci/common
-          await_jupyterhub
           await_autohttps_tls_cert_acquisition
 
       - name: Run tests