From ca7d3b237616f27e48cf983852c57bee76b82bea Mon Sep 17 00:00:00 2001 From: Jan Mussler Date: Thu, 17 Dec 2020 17:06:00 +0100 Subject: [PATCH 1/3] Update test_e2e.py Using smaller image for e2e test. --- e2e/tests/test_e2e.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index 98606ec95..26acd0b28 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -11,8 +11,8 @@ from kubernetes import client from tests.k8s_api import K8s from kubernetes.client.rest import ApiException -SPILO_CURRENT = "registry.opensource.zalan.do/acid/spilo-13:2.0-p2" -SPILO_LAZY = "registry.opensource.zalan.do/acid/spilo-cdp-13:2.0-p145" +SPILO_CURRENT = "registry.opensource.zalan.do/acid/spilo-13-e2e:0.2" +SPILO_LAZY = "registry.opensource.zalan.do/acid/spilo-13-e2e:0.1" def to_selector(labels): From 52bddaa646ac059fd722ef07660fc38fe4dec927 Mon Sep 17 00:00:00 2001 From: Jan Mussler Date: Thu, 17 Dec 2020 17:06:32 +0100 Subject: [PATCH 2/3] Update run.sh smaller image --- e2e/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/run.sh b/e2e/run.sh index ef219847f..6673b82e0 100755 --- a/e2e/run.sh +++ b/e2e/run.sh @@ -8,7 +8,7 @@ IFS=$'\n\t' readonly cluster_name="postgres-operator-e2e-tests" readonly kubeconfig_path="/tmp/kind-config-${cluster_name}" -readonly spilo_image="registry.opensource.zalan.do/acid/spilo-13:2.0-p2" +readonly spilo_image="registry.opensource.zalan.do/acid/spilo-13-e2e:0.2" readonly e2e_test_runner_image="registry.opensource.zalan.do/acid/postgres-operator-e2e-tests-runner:0.3" export GOPATH=${GOPATH-~/go} From 844bbaf6a9d03a31c7ff7ef9f7a4587892791ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Mu=C3=9Fler?= Date: Thu, 17 Dec 2020 17:45:12 +0100 Subject: [PATCH 3/3] Make e2e use image from test_e2e.py --- e2e/tests/test_e2e.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index 26acd0b28..55aa54d01 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -11,8 +11,8 @@ from kubernetes import client from tests.k8s_api import K8s from kubernetes.client.rest import ApiException -SPILO_CURRENT = "registry.opensource.zalan.do/acid/spilo-13-e2e:0.2" -SPILO_LAZY = "registry.opensource.zalan.do/acid/spilo-13-e2e:0.1" +SPILO_CURRENT = "registry.opensource.zalan.do/acid/spilo-13-e2e:0.1" +SPILO_LAZY = "registry.opensource.zalan.do/acid/spilo-13-e2e:0.2" def to_selector(labels): @@ -112,6 +112,7 @@ class EndToEndTestCase(unittest.TestCase): with open("manifests/configmap.yaml", 'r+') as f: configmap = yaml.safe_load(f) configmap["data"]["workers"] = "1" + configmap["data"]["docker_image"] = SPILO_CURRENT with open("manifests/configmap.yaml", 'w') as f: yaml.dump(configmap, f, Dumper=yaml.Dumper) @@ -121,7 +122,6 @@ class EndToEndTestCase(unittest.TestCase): "operatorconfiguration.crd.yaml", "postgresteam.crd.yaml", "configmap.yaml", - "postgresql-operator-default-configuration.yaml", "postgres-operator.yaml", "api-service.yaml", "infrastructure-roles.yaml",