ci: make await_binderhub smarter

jupyterhub · Oct 10, 2021 · 1c35ceb · 1c35ceb
1 parent abdb8c8
commit 1c35ceb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -164,7 +164,7 @@ jobs:
         if: matrix.test == 'helm'
         run: |
             . ci/common
-            await_binderhub
+            await_binderhub binderhub-test
 
             echo curl http://localhost:30901/health to check BinderHub\'s health
             curl http://localhost:30901/health --max-time 5 --retry 5 --retry-delay 1 --retry-connrefused

diff --git a/ci/common b/ci/common
@@ -18,6 +18,17 @@ await_jupyterhub() {
 }
 
 await_binderhub() {
-    await_jupyterhub
-    kubectl rollout status --watch --timeout 300s deployment/binder
+    # accepts the release name as a parameter
+    await_jupyterhub \
+ && kubectl rollout status --watch --timeout 300s deployment/binder \
+ && (
+        if kubectl get "daemonset/${1}-dind" > /dev/null 2>&1; then
+            kubectl rollout status --watch --timeout 300s "daemonset/${1}-dind"
+        fi
+    )
+ && (
+        if kubectl get "daemonset/${1}-image-cleaner" > /dev/null 2>&1; then
+            kubectl rollout status --watch --timeout 300s "daemonset/${1}-image-cleaner"
+        fi
+    )
 }