From 18bdde82a51242355c3606986a187bbeea0a101a Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Tue, 12 Jan 2021 16:49:57 +0100 Subject: [PATCH 1/3] disable node affinity test --- e2e/tests/test_e2e.py | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index 9e2035652..dd70e0257 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -929,6 +929,7 @@ def test_zzz_taint_based_eviction(self): new_master_node = nm[0] self.assert_distributed_pods(new_master_node, new_replica_nodes, cluster_label) + @unittest.skip("flaky test, to be fixed later") @timeout_decorator.timeout(TEST_TIMEOUT_SEC) def test_node_affinity(self): ''' From 29c81e6c092fc3e2677b7c189ff22828a8586fa6 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Thu, 14 Jan 2021 18:19:58 +0100 Subject: [PATCH 2/3] test increased timeout on github --- e2e/scripts/watch_objects.sh | 4 +++- e2e/tests/test_e2e.py | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/e2e/scripts/watch_objects.sh b/e2e/scripts/watch_objects.sh index 4c9b82404..fc3cc167b 100755 --- a/e2e/scripts/watch_objects.sh +++ b/e2e/scripts/watch_objects.sh @@ -1,8 +1,10 @@ #!/bin/bash -watch -c " +watch -n 0.1 -c " kubectl get postgresql --all-namespaces echo +kubectl exec \$(kubectl get pod -l name=postgres-operator --no-headers) -- curl -s localhost:8080/workers/all/status/ | jq . +echo echo -n 'Rolling upgrade pending: ' kubectl get statefulset -o jsonpath='{.items..metadata.annotations.zalando-postgres-operator-rolling-update-required}' echo diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index dd70e0257..16646b02c 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -35,7 +35,7 @@ class EndToEndTestCase(unittest.TestCase): # `kind` pods may stuck in the `Terminating` phase for a few minutes; hence high test timeout TEST_TIMEOUT_SEC = 600 - def eventuallyEqual(self, f, x, m, retries=60, interval=2): + def eventuallyEqual(self, f, x, m, retries=60, interval=3): while True: try: y = f() @@ -47,7 +47,7 @@ def eventuallyEqual(self, f, x, m, retries=60, interval=2): raise time.sleep(interval) - def eventuallyNotEqual(self, f, x, m, retries=60, interval=2): + def eventuallyNotEqual(self, f, x, m, retries=60, interval=3): while True: try: y = f() @@ -59,7 +59,7 @@ def eventuallyNotEqual(self, f, x, m, retries=60, interval=2): raise time.sleep(interval) - def eventuallyTrue(self, f, m, retries=60, interval=2): + def eventuallyTrue(self, f, m, retries=60, interval=3): while True: try: self.assertTrue(f(), m) @@ -929,7 +929,6 @@ def test_zzz_taint_based_eviction(self): new_master_node = nm[0] self.assert_distributed_pods(new_master_node, new_replica_nodes, cluster_label) - @unittest.skip("flaky test, to be fixed later") @timeout_decorator.timeout(TEST_TIMEOUT_SEC) def test_node_affinity(self): ''' From 1f1a4a029f0513febeab012d1a169e13640df3cc Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Fri, 15 Jan 2021 10:26:36 +0100 Subject: [PATCH 3/3] check if test_multinamespace_support causes problems --- e2e/tests/test_e2e.py | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index 16646b02c..6633894c8 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -708,6 +708,7 @@ def setUp(cls): pass @timeout_decorator.timeout(TEST_TIMEOUT_SEC) + @unittest.skip("Skipping this test until fixed") def test_multi_namespace_support(self): ''' Create a customized Postgres cluster in a non-default namespace.