make waiting for pods better

.gitlab-ci.yml

@@ -157,10 +157,8 @@ prometheus-alerts:
 behave-nextcloud:
   stage: integration-test
   script:
-    # Wait for Nextcloud deployment to be available.
-    - ssh root@$ADDRESS '/bin/bash -c "kubectl wait -n oas-apps deployment/nc-nextcloud --for condition=Available --timeout=20m"'
-    # Also wait for ONLYOFFICE documentserver
-    - ssh root@$ADDRESS '/bin/bash -c "kubectl wait -n oas-apps deployment/nc-onlyoffice-documentserver --for condition=Available --timeout=20m"'
+    # Wait for Nextcloud and ONLYOFFICE pods to be Ready
+    - ssh root@$ADDRESS '/bin/bash -c "kubectl wait -n oas-apps pod -l app.kubernetes.io/instance=nc --for condition=Ready --timeout=20m"'
     # Run behave tests against Nextcloud and ONLYOFFICE
     - python3 -m openappstack $HOSTNAME test --behave-headless --behave-tags nextcloud || python3 -m openappstack $HOSTNAME test --behave-headless --behave-rerun-failing --behave-tags nextcloud
   artifacts:
@@ -181,8 +179,8 @@ behave-nextcloud:
 behave-rocketchat:
   stage: integration-test
   script:
-    # Wait for Rocket.Chat deployment to be available.
-    - ssh root@$ADDRESS '/bin/bash -c "kubectl wait -n oas-apps deployment/rocketchat-rocketchat --for condition=Available --timeout=20m"'
+    # Wait for Rocket.Chat pod to be Ready
+    - ssh root@$ADDRESS '/bin/bash -c "kubectl wait -n oas-apps pod -l app.kubernetes.io/instance=rocketchat --for condition=Ready --timeout=20m"'
     # Run behave tests against Rocket.Chat
     - python3 -m openappstack $HOSTNAME test --behave-headless --behave-tags rocketchat || python3 -m openappstack $HOSTNAME test --behave-headless --behave-rerun-failing --behave-tags rocketchat
   artifacts:
@@ -203,8 +201,8 @@ behave-rocketchat:
 behave-grafana:
   stage: integration-test
   script:
-    # Wait for Grafana deployment to be available.
-    - ssh root@$ADDRESS '/bin/bash -c "kubectl wait -n oas deployment/monitoring-grafana --for condition=Available --timeout=20m"'
+    # Wait for Grafana pod to be Ready.
+    - ssh root@$ADDRESS '/bin/bash -c "kubectl wait -n oas pod -l app=grafana --for condition=Ready --timeout=20m"'
     # Run behave tests against Grafana
     - python3 -m openappstack $HOSTNAME test --behave-headless --behave-tags grafana || python3 -m openappstack $HOSTNAME test --behave-headless --behave-rerun-failing --behave-tags grafana
   artifacts: