summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasledzinskiy <asledzinskiy@mirantis.com>2016-12-08 16:57:23 +0200
committerasledzinskiy <asledzinskiy@mirantis.com>2016-12-08 16:57:23 +0200
commit97989e87aec929df9c77f466c2d9281c62332461 (patch)
tree2c1ce88a599eff201f1773347e4234fa7ce04f5a
parent2cc97d84abcd381990e02e23556cf11377569e2a (diff)
Change build images condition
- Our registry by default is set to local registry so condition like 'if not settings.registry' doesn't make sense. Change it condition to compare with local registry address Change-Id: I7c49be77f6cdee921116df18891809eab618f376
Notes
Notes (review): Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: tatyana-leontovich <tleontovich@mirantis.com> Code-Review+1: Evgeny Sikachev <esikachev@mirantis.com> Workflow+1: Artem Panchenko <apanchenko@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 09 Dec 2016 09:26:48 +0000 Reviewed-on: https://review.openstack.org/408659 Project: openstack/fuel-ccp-tests Branch: refs/heads/master
-rw-r--r--fuel_ccp_tests/fixtures/os_fixtures.py2
-rw-r--r--fuel_ccp_tests/managers/osmanager.py2
-rw-r--r--fuel_ccp_tests/tests/system/test_deploy.py16
-rw-r--r--fuel_ccp_tests/tests/system/test_few_os.py6
4 files changed, 9 insertions, 17 deletions
diff --git a/fuel_ccp_tests/fixtures/os_fixtures.py b/fuel_ccp_tests/fixtures/os_fixtures.py
index bb7cb9f..a6f9537 100644
--- a/fuel_ccp_tests/fixtures/os_fixtures.py
+++ b/fuel_ccp_tests/fixtures/os_fixtures.py
@@ -64,7 +64,7 @@ def galera_deployed(ccpcluster,
64 # Note: keep fixtures in strict dependences from each other! 64 # Note: keep fixtures in strict dependences from each other!
65 if not config.os.running: 65 if not config.os.running:
66 general_config = deepcopy(settings.CCP_CONF) 66 general_config = deepcopy(settings.CCP_CONF)
67 if settings.BUILD_IMAGES: 67 if settings.REGISTRY == "127.0.0.1:31500":
68 k8s_actions.create_registry() 68 k8s_actions.create_registry()
69 ccpcluster.build() 69 ccpcluster.build()
70 topology_path = \ 70 topology_path = \
diff --git a/fuel_ccp_tests/managers/osmanager.py b/fuel_ccp_tests/managers/osmanager.py
index 9e7e5b9..c8c0c6d 100644
--- a/fuel_ccp_tests/managers/osmanager.py
+++ b/fuel_ccp_tests/managers/osmanager.py
@@ -50,7 +50,7 @@ class OSManager(object):
50 Deploy openstack with stacklight topology 50 Deploy openstack with stacklight topology
51 """ 51 """
52 LOG.info("Preparing openstack log collector fixture...") 52 LOG.info("Preparing openstack log collector fixture...")
53 if settings.BUILD_IMAGES: 53 if settings.REGISTRY == "127.0.0.1:31500":
54 LOG.info("Creating registry...") 54 LOG.info("Creating registry...")
55 self.__k8s_actions.create_registry() 55 self.__k8s_actions.create_registry()
56 LOG.info("Building images...") 56 LOG.info("Building images...")
diff --git a/fuel_ccp_tests/tests/system/test_deploy.py b/fuel_ccp_tests/tests/system/test_deploy.py
index a798d94..90e5b45 100644
--- a/fuel_ccp_tests/tests/system/test_deploy.py
+++ b/fuel_ccp_tests/tests/system/test_deploy.py
@@ -46,14 +46,10 @@ class TestDeployOpenstack(base_test.SystemBaseTest):
46 46
47 Duration 35 min 47 Duration 35 min
48 """ 48 """
49 if settings.BUILD_IMAGES: 49 if settings.REGISTRY == "127.0.0.1:31500":
50 k8s_actions.create_registry() 50 k8s_actions.create_registry()
51 ccpcluster.build() 51 ccpcluster.build()
52 else: 52
53 if not settings.REGISTRY:
54 raise ValueError("The REGISTRY variable should be set with "
55 "external registry address, "
56 "current value {0}".format(settings.REGISTRY))
57 ccpcluster.deploy() 53 ccpcluster.deploy()
58 post_os_deploy_checks.check_jobs_status(k8s_actions.api) 54 post_os_deploy_checks.check_jobs_status(k8s_actions.api)
59 post_os_deploy_checks.check_pods_status(k8s_actions.api) 55 post_os_deploy_checks.check_pods_status(k8s_actions.api)
@@ -82,14 +78,10 @@ class TestDeployOpenstack(base_test.SystemBaseTest):
82 Duration 35 min 78 Duration 35 min
83 """ 79 """
84 remote = underlay.remote(host=config.k8s.kube_host) 80 remote = underlay.remote(host=config.k8s.kube_host)
85 if settings.BUILD_IMAGES: 81 if settings.REGISTRY == "127.0.0.1:31500":
86 k8s_actions.create_registry() 82 k8s_actions.create_registry()
87 ccpcluster.build() 83 ccpcluster.build()
88 else: 84
89 if not settings.REGISTRY:
90 raise ValueError("The REGISTRY variable should be set with "
91 "external registry address, "
92 "current value {0}".format(settings.REGISTRY))
93 ccpcluster.deploy() 85 ccpcluster.deploy()
94 post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=4500) 86 post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=4500)
95 post_os_deploy_checks.check_pods_status(k8s_actions.api, timeout=4500) 87 post_os_deploy_checks.check_pods_status(k8s_actions.api, timeout=4500)
diff --git a/fuel_ccp_tests/tests/system/test_few_os.py b/fuel_ccp_tests/tests/system/test_few_os.py
index 5e82867..f3274c2 100644
--- a/fuel_ccp_tests/tests/system/test_few_os.py
+++ b/fuel_ccp_tests/tests/system/test_few_os.py
@@ -45,7 +45,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
45 45
46 Duration 90 min 46 Duration 90 min
47 """ 47 """
48 if not settings.REGISTRY: 48 if settings.REGISTRY == "127.0.0.1:31500":
49 k8s_actions.create_registry() 49 k8s_actions.create_registry()
50 ccpcluster.build() 50 ccpcluster.build()
51 topology_path = \ 51 topology_path = \
@@ -113,7 +113,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
113 113
114 Duration 90 min 114 Duration 90 min
115 """ 115 """
116 if not settings.REGISTRY: 116 if settings.REGISTRY == "127.0.0.1:31500":
117 k8s_actions.create_registry() 117 k8s_actions.create_registry()
118 ccpcluster.build() 118 ccpcluster.build()
119 topology_path = \ 119 topology_path = \
@@ -182,7 +182,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
182 182
183 Duration 60 min 183 Duration 60 min
184 """ 184 """
185 if not settings.REGISTRY: 185 if settings.REGISTRY == "127.0.0.1:31500":
186 k8s_actions.create_registry() 186 k8s_actions.create_registry()
187 ccpcluster.build() 187 ccpcluster.build()
188 topology_path = \ 188 topology_path = \