From 199031d115d2652beb65eb9e16045a98bbd165f1 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 29 Sep 2021 17:08:47 +0200
Subject: [PATCH] Test if deployments have all their replicaset's pods in ready
state and delay alert job
TRIGGER_JOBS=enable-monitoring,enable-nextcloud,enable-rocketchat,enable-wordpress,enable-wekan
---
.gitlab-ci.yml | 3 ---
test/pytest/test_resources.py | 6 ++----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4984029b5..65a261ba3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -857,9 +857,6 @@ kube-prometheus-stack-alerts:
extends:
- .ssh_setup
- .kube_prometheus_stack_rules
- needs:
- - job: kube-prometheus-stack-deployment
- - job: setup-openappstack
interruptible: true
diff --git a/test/pytest/test_resources.py b/test/pytest/test_resources.py
index e91ff21a8..98657e5e5 100644
--- a/test/pytest/test_resources.py
+++ b/test/pytest/test_resources.py
@@ -227,11 +227,9 @@ def test_deployments(resource, namespace):
resource = deployment.metadata.name
namespace = deployment.metadata.namespace
deployment = api.read_namespaced_deployment_status(resource, namespace)
- ready = False
- for condition in deployment.status.conditions:
- if condition.type == 'Available':
- ready = condition.status == 'True'
+ ready = deployment.status.replicas == deployment.status.ready_replicas
print(f'Deployment "{resource}" in namespace "{namespace}": {ready}')
+
if not ready:
failed += 1
failed_resources.append(resource)
--
GitLab