remove unnecessary steps from gitlab ci, checkout correct version of...

remove unnecessary steps from gitlab ci, checkout correct version of rocketchat chart, check certs of OO and grafana

.gitlab-ci.yml

@@ -157,11 +157,6 @@ prometheus-alerts:
 behave-nextcloud:
   stage: integration-test
   script:
-    # Wait until flux creates the NextCloud HelmRelease.
-    - ssh root@$ADDRESS '/bin/bash -c "while true; do kubectl get hr -n oas-apps nextcloud; if [ \$? -eq 0 ]; then break; fi; sleep 20; done"'
-    # Wait until NextCloud is ready.
-    - ssh root@$ADDRESS '/bin/bash -c "kubectl wait -n oas-apps hr/nextcloud --for condition=Released --timeout=20m"'
-    # Run the behave tests for NextCloud.
     - python3 -m openappstack $HOSTNAME test --behave-headless --behave-tags nextcloud || python3 -m openappstack $HOSTNAME test --behave-headless --behave-rerun-failing --behave-tags nextcloud
   artifacts:
     paths:
@@ -181,11 +176,6 @@ behave-nextcloud:
 behave-rocketchat:
   stage: integration-test
   script:
-    # Wait until flux creates the Rocket.Chat HelmRelease.
-    - ssh root@$ADDRESS '/bin/bash -c "while true; do kubectl get hr -n oas-apps rocketchat; if [ \$? -eq 0 ]; then break; fi; sleep 20; done"'
-    # Wait until Rocket.Chat is ready.
-    - ssh root@$ADDRESS '/bin/bash -c "kubectl wait -n oas-apps hr/rocketchat --for condition=Released --timeout=20m"'
-    # Run the behave tests for 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:
     paths:

flux/rocketchat.yaml

@@ -15,7 +15,7 @@ spec:
     # https://github.com/helm/charts/pull/19637
     # version: 2.0.1
     git: https://github.com/greenhost/charts
-    ref: 1f0b680d896e12828845c666aef89d5b1ba8e89e
+    ref: 8ba9bdcc2772fd9eed5891e11a4d831bdc8eb00b
     path: stable/rocketchat
   valuesFrom:
     - secretKeyRef:

test/pytest/test_certs.py

@@ -104,8 +104,10 @@ def test_cert_validation(host):
                                 ['pytest/le-staging-bundle.pem'])
 
     # Check nextcloud cert
-    assert valid_cert('files.{0}'.format(domain))
     assert valid_cert('chat.{0}'.format(domain))
+    assert valid_cert('grafana.{0}'.format(domain))
+    assert valid_cert('files.{0}'.format(domain))
+    assert valid_cert('office.{0}'.format(domain))
 
 
 if __name__ == "__main__":