diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eaef553ac2ecb82eca61fe7223de9b3144207aef..79c3f12156d87144af11740533168889cfffc3fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ include: - | echo "Env vars:" echo - env | grep -E '^(CLUSTER_NAME|FQDN|IP_ADDRESS|ANSIBLE_HOST_KEY_CHECKING|KANIKO_BUILD_IMAGENAME|SSH_KEY_ID|SHELL|CI_PROJECT_DIR)=' + env | grep -E '^(HOSTNAME|CLUSTER_NAME|FQDN|IP_ADDRESS|ANSIBLE_HOST_KEY_CHECKING|KANIKO_BUILD_IMAGENAME|SSH_KEY_ID|SHELL|CI_PROJECT_DIR)=' echo echo "Uptime: $(uptime)" echo "KANIKO build image ref: ${CI_REGISTRY_IMAGE}/${KANIKO_BUILD_IMAGENAME}:${CI_CONTAINER_TAG}" @@ -683,7 +683,7 @@ testinfra: - .general_rules interruptible: true -kube-prometheus-stack-alerts: +prometheus-alerts: stage: cluster-health needs: - job: install-stackspin @@ -695,10 +695,7 @@ kube-prometheus-stack-alerts: - *debug_information - export BASIC_AUTH_PW=$(python3 -m stackspin $HOSTNAME secrets | grep stackspin-prometheus-basic-auth | cut -d'=' -f2) - cd test/ - - > - bash ../.gitlab/ci_scripts/retry_cmd_until_success.sh 30 10 - pytest -s -m 'prometheus' --connection=ansible - --ansible-inventory=../${CLUSTER_DIR}/inventory.yml --hosts='ansible://*' + - bash ../.gitlab/ci_scripts/retry_cmd_until_success.sh 30 10 pytest -s -m prometheus extends: - .monitoring_rules interruptible: true