diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d500cc3176a3c5e79190d9a2de35e3ed28532b88..9705d3d9dfafe6ebea4bee123edd51a267fa1020 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,22 +93,6 @@ include: - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-monitoring/' - if: '$CI_COMMIT_BRANCH == "main"' -.eventrouter_rules: - extends: - - .monitoring_rules - -.loki_rules: - extends: - - .monitoring_rules - -.promtail_rules: - extends: - - .monitoring_rules - -.kube_prometheus_stack_rules: - extends: - - .monitoring_rules - .nextcloud_rules: rules: - changes: @@ -122,14 +106,6 @@ include: - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-nextcloud/' - if: '$CI_COMMIT_BRANCH == "main"' -.cert_manager_rules: - extends: - - .general_rules - -.local_path_provisioner_rules: - extends: - - .general_rules - .single_sign_on_rules: rules: - changes: @@ -602,7 +578,7 @@ kube-prometheus-stack-cert: - job: configure-stackspin extends: - .apps-cert - - .kube_prometheus_stack_rules + - .monitoring_rules single-sign-on-cert: variables: @@ -674,7 +650,7 @@ testinfra: kube-prometheus-stack-alerts: stage: health-test variables: - # RESOURCE var is used in job specific rules (i.e. .kube_prometheus_stack_rules) + # 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 @@ -686,7 +662,7 @@ kube-prometheus-stack-alerts: - 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://*' extends: - .ssh_setup - - .kube_prometheus_stack_rules + - .monitoring_rules interruptible: true @@ -730,7 +706,7 @@ grafana-taiko: - job: monitoring-kustomization-ready extends: - .taiko - - .kube_prometheus_stack_rules + - .monitoring_rules nextcloud-taiko: variables: