Rename cluster-health stage, fix cert needs

.gitlab-ci.yml

@@ -167,7 +167,7 @@ stages:
   - configure-stackspin
   - apps-kustomizations-ready
   - certs
-  - health-test
+  - cluster-health
   - integration-test
 
 variables:
@@ -599,7 +599,7 @@ nextcloud-cert:
   variables:
     RESOURCE: "nextcloud"
   needs:
-    - job: nextcloud-kustomization-ready
+    - job: configure-zerossl-issuer
     - job: install-stackspin
   extends:
     - .apps-cert
@@ -609,7 +609,7 @@ kube-prometheus-stack-cert:
   variables:
     RESOURCE: "kube-prometheus-stack"
   needs:
-    - job: monitoring-kustomization-ready
+    - job: configure-zerossl-issuer
     - job: install-stackspin
   extends:
     - .apps-cert
@@ -619,7 +619,7 @@ single-sign-on-cert:
   variables:
     RESOURCE: "single-sign-on"
   needs:
-    - job: single-sign-on-kustomization-ready
+    - job: configure-zerossl-issuer
     - job: install-stackspin
   extends:
     - .apps-cert
@@ -629,7 +629,7 @@ dashboard-cert:
   variables:
     RESOURCE: "dashboard"
   needs:
-    - job: dashboard-kustomization-ready
+    - job: configure-zerossl-issuer
     - job: install-stackspin
   extends:
     - .apps-cert
@@ -639,7 +639,7 @@ wekan-cert:
   variables:
     RESOURCE: "wekan"
   needs:
-    - job: wekan-kustomization-ready
+    - job: configure-zerossl-issuer
     - job: install-stackspin
   extends:
     - .apps-cert
@@ -649,7 +649,7 @@ wordpress-cert:
   variables:
     RESOURCE: "wordpress"
   needs:
-    - job: wordpress-kustomization-ready
+    - job: configure-zerossl-issuer
     - job: install-stackspin
   extends:
     - .apps-cert
@@ -659,20 +659,22 @@ zulip-cert:
   variables:
     RESOURCE: "zulip"
   needs:
-    - job: zulip-kustomization-ready
+    - job: configure-zerossl-issuer
     - job: install-stackspin
   extends:
     - .apps-cert
     - .zulip_rules
 
 
-# Stage: health-test
-# ==================
+# Stage: cluster-health
+# =====================
 #
 # General cluster health checks
 
 testinfra:
-  stage: health-test
+  stage: cluster-health
+  needs:
+    - job: install-stackspin
   script:
     - *debug_information
     - cd ansible/
@@ -683,13 +685,13 @@ testinfra:
   interruptible: true
 
 kube-prometheus-stack-alerts:
-  stage: health-test
+  stage: cluster-health
+  needs:
+    - job: install-stackspin
+    - job: kube-prometheus-stack-cert
   variables:
     # RESOURCE var is used in job specific rules (i.e. ..monitoring_rules)
     RESOURCE: "kube-prometheus-stack"
-    # Enforce python requests using the system cert store, where LE staging
-    # cacert is added
-    REQUESTS_CA_BUNDLE: "/etc/ssl/certs/ca-certificates.crt"
   script:
     - *debug_information
     - export BASIC_AUTH_PW=$(python3 -m stackspin $HOSTNAME secrets | grep stackspin-prometheus-basic-auth | cut -d'=' -f2)