Make e2e use image from test_e2e.py
This commit is contained in:
		
							parent
							
								
									52bddaa646
								
							
						
					
					
						commit
						844bbaf6a9
					
				| 
						 | 
					@ -11,8 +11,8 @@ from kubernetes import client
 | 
				
			||||||
from tests.k8s_api import K8s
 | 
					from tests.k8s_api import K8s
 | 
				
			||||||
from kubernetes.client.rest import ApiException
 | 
					from kubernetes.client.rest import ApiException
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SPILO_CURRENT = "registry.opensource.zalan.do/acid/spilo-13-e2e:0.2"
 | 
					SPILO_CURRENT = "registry.opensource.zalan.do/acid/spilo-13-e2e:0.1"
 | 
				
			||||||
SPILO_LAZY = "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):
 | 
					def to_selector(labels):
 | 
				
			||||||
| 
						 | 
					@ -112,6 +112,7 @@ class EndToEndTestCase(unittest.TestCase):
 | 
				
			||||||
        with open("manifests/configmap.yaml", 'r+') as f:
 | 
					        with open("manifests/configmap.yaml", 'r+') as f:
 | 
				
			||||||
            configmap = yaml.safe_load(f)
 | 
					            configmap = yaml.safe_load(f)
 | 
				
			||||||
            configmap["data"]["workers"] = "1"
 | 
					            configmap["data"]["workers"] = "1"
 | 
				
			||||||
 | 
					            configmap["data"]["docker_image"] = SPILO_CURRENT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        with open("manifests/configmap.yaml", 'w') as f:
 | 
					        with open("manifests/configmap.yaml", 'w') as f:
 | 
				
			||||||
            yaml.dump(configmap, f, Dumper=yaml.Dumper)
 | 
					            yaml.dump(configmap, f, Dumper=yaml.Dumper)
 | 
				
			||||||
| 
						 | 
					@ -121,7 +122,6 @@ class EndToEndTestCase(unittest.TestCase):
 | 
				
			||||||
                         "operatorconfiguration.crd.yaml",
 | 
					                         "operatorconfiguration.crd.yaml",
 | 
				
			||||||
                         "postgresteam.crd.yaml",
 | 
					                         "postgresteam.crd.yaml",
 | 
				
			||||||
                         "configmap.yaml",
 | 
					                         "configmap.yaml",
 | 
				
			||||||
                         "postgresql-operator-default-configuration.yaml",
 | 
					 | 
				
			||||||
                         "postgres-operator.yaml",
 | 
					                         "postgres-operator.yaml",
 | 
				
			||||||
                         "api-service.yaml",
 | 
					                         "api-service.yaml",
 | 
				
			||||||
                         "infrastructure-roles.yaml",
 | 
					                         "infrastructure-roles.yaml",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue