Fix promtail and prometheus test

.gitlab-ci.yml

@@ -606,6 +606,17 @@ wordpress-helm-release:
     - .ssh_setup
   interruptible: true
 
+.apps-daemonset:
+  stage: apps-ready
+  script:
+    - *debug_information
+    - cd ansible/
+    - export KUBECONFIG="${PWD}/../clusters/${HOSTNAME}/kube_config_cluster.yml"
+    - pytest -v -s -m 'daemonsets' --resource="$RESOURCE" --namespace="$NAMESPACE" --connection=ansible --ansible-inventory=${CLUSTER_DIR}/inventory.yml --hosts='ansible://*' --reruns 120 --reruns-delay 10
+  extends:
+    - .ssh_setup
+  interruptible: true
+
 cert-manager-deployment:
   variables:
     RESOURCE: "cert-manager"
@@ -650,7 +661,7 @@ loki-statefulset:
     - .apps-statefulset
     - .loki_rules
 
-promtail-deployment:
+promtail-daemonset:
   variables:
     RESOURCE: "promtail"
     NAMESPACE: "oas"
@@ -658,7 +669,7 @@ promtail-deployment:
     - job: promtail-helm-release
     - job: setup-openappstack
   extends:
-    - .apps-deployment
+    - .apps-daemonset
     - .promtail_rules
 
 nextcloud-deployment:
@@ -716,7 +727,7 @@ wekan-deployment:
     - .apps-deployment
     - .wekan_rules
 
-wordpress-deployment:
+wordpress-statefulset:
   variables:
     RESOURCE: "wordpress"
     NAMESPACE: "oas-apps"
@@ -724,7 +735,7 @@ wordpress-deployment:
     - job: wordpress-helm-release
     - job: setup-openappstack
   extends:
-    - .apps-deployment
+    - .apps-statefulset
     - .wordpress_rules
 
 # Stage: certs
@@ -796,7 +807,7 @@ wordpress-cert:
   variables:
     RESOURCE: "wordpress"
   needs:
-    - job: wordpress-deployment
+    - job: wordpress-statefulset
     - job: setup-openappstack
   extends:
     - .apps-cert
@@ -824,11 +835,15 @@ kube-prometheus-stack-alerts:
   variables:
     # RESOURCE var is used in job specific rules (i.e. .kube_prometheus_stack_rules)
     RESOURCE: "kube-prometheus-stack"
+    CURL_CA_BUNDLE: "pytest/le-staging-bundle.pem"
+    CURL_OPTS: '--config curl.conf'
   allow_failure: true
   script:
     - *debug_information
-    - export BASIC_AUTH_PW=$(python3 -m openappstack varac-test secrets | grep oas-prometheus-basic-auth | cut -d'=' -f2)
+    - export BASIC_AUTH_PW=$(python3 -m openappstack $HOSTNAME secrets | grep oas-prometheus-basic-auth | cut -d'=' -f2)
     - cd test/
+    # Ensure password is not part of the URL and leaked on errors
+    - echo "user=admin:$BASIC_AUTH_PW" > curl.conf
     - pytest -s -m 'prometheus' --connection=ansible --ansible-inventory=${CLUSTER_DIR}/inventory.yml --hosts='ansible://*'
   extends:
     - .ssh_setup