From c00ee05da87cd2701c6d6d779b41a56e719ee9cd Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 10 Jul 2015 19:48:33 +0000 Subject: [PATCH 1/8] Change deploy from source parent directory because /dev/vdb is needed by cinder. --- tests/basic_deployment.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index d364d313..43ccbf47 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -86,7 +86,9 @@ class CinderBasicDeployment(OpenStackAmuletDeployment): 'repository': 'git://github.com/openstack/cinder', 'branch': cinder_branch}, ], - 'directory': '/mnt/openstack-git', + # Most tests use /mnt/openstack-git but cinder's using /dev/vdb + # to store block devices so leave /mnt alone. + 'directory': '/tmp/openstack-git', 'http_proxy': amulet_http_proxy, 'https_proxy': amulet_http_proxy, } From 7011146ea20937972020023f021bdbf3e81631c9 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Sun, 12 Jul 2015 20:34:30 +0000 Subject: [PATCH 2/8] Have icehouse amulet tests use repo with pinned oslo requirements. --- tests/basic_deployment.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 43ccbf47..87912e4d 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -70,21 +70,16 @@ class CinderBasicDeployment(OpenStackAmuletDeployment): 'glance-api-version': '2', 'overwrite': 'true'} if self.git: - release = self._get_openstack_release_string() - reqs_branch = 'stable/' + release - if self._get_openstack_release() == self.trusty_icehouse: - cinder_branch = release + '-eol' - else: - cinder_branch = 'stable/' + release + branch = 'stable/' + self._get_openstack_release_string() amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY') openstack_origin_git = { 'repositories': [ {'name': 'requirements', 'repository': 'git://github.com/openstack/requirements', - 'branch': reqs_branch}, + 'branch': branch}, {'name': 'cinder', - 'repository': 'git://github.com/openstack/cinder', - 'branch': cinder_branch}, + 'repository': 'git://github.com/coreycb/cinder', + 'branch': branch}, ], # Most tests use /mnt/openstack-git but cinder's using /dev/vdb # to store block devices so leave /mnt alone. From 95c8c4e6cb370beb17bdd98b4570c22eee0dee89 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Sun, 12 Jul 2015 21:03:26 +0000 Subject: [PATCH 3/8] Fixup amulet git repos --- tests/basic_deployment.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 87912e4d..577deb4b 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -72,13 +72,19 @@ class CinderBasicDeployment(OpenStackAmuletDeployment): if self.git: branch = 'stable/' + self._get_openstack_release_string() amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY') + if self._get_openstack_release() == self.trusty_icehouse: + reqs_repo = 'git://github.com/coreycb/requirements' + cinder_repo = 'git://github.com/coreycb/cinder' + else: + reqs_repo = 'git://github.com/openstack/requirements' + cinder_repo = 'git://github.com/openstack/cinder' openstack_origin_git = { 'repositories': [ {'name': 'requirements', - 'repository': 'git://github.com/openstack/requirements', + 'repository': reqs_repo, 'branch': branch}, {'name': 'cinder', - 'repository': 'git://github.com/coreycb/cinder', + 'repository': cinder_repo, 'branch': branch}, ], # Most tests use /mnt/openstack-git but cinder's using /dev/vdb From 57afb25cba7ee6cb1ade1614b56a7b2bdd36cf5a Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Mon, 13 Jul 2015 11:28:59 +0000 Subject: [PATCH 4/8] Switch amulet icehouse tests back to using upstream core repositories. --- tests/basic_deployment.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 577deb4b..3c236ea4 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -74,10 +74,9 @@ class CinderBasicDeployment(OpenStackAmuletDeployment): amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY') if self._get_openstack_release() == self.trusty_icehouse: reqs_repo = 'git://github.com/coreycb/requirements' - cinder_repo = 'git://github.com/coreycb/cinder' else: reqs_repo = 'git://github.com/openstack/requirements' - cinder_repo = 'git://github.com/openstack/cinder' + cinder_repo = 'git://github.com/openstack/cinder' openstack_origin_git = { 'repositories': [ {'name': 'requirements', From 7768f98ec634f12ad819b5d0863fafc7831c6613 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Mon, 13 Jul 2015 12:44:41 +0000 Subject: [PATCH 5/8] More amulet deploy from source branch fixups. --- tests/basic_deployment.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 3c236ea4..5ecb3770 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -70,21 +70,29 @@ class CinderBasicDeployment(OpenStackAmuletDeployment): 'glance-api-version': '2', 'overwrite': 'true'} if self.git: - branch = 'stable/' + self._get_openstack_release_string() amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY') + if self._get_openstack_release() == self.trusty_icehouse: reqs_repo = 'git://github.com/coreycb/requirements' else: reqs_repo = 'git://github.com/openstack/requirements' cinder_repo = 'git://github.com/openstack/cinder' + + release = self._get_openstack_release_string() + reqs_branch = 'stable/' + release + if self._get_openstack_release() == self.trusty_icehouse: + cinder_branch = release + '-eol' + else: + cinder_branch = 'stable/' + release + openstack_origin_git = { 'repositories': [ {'name': 'requirements', 'repository': reqs_repo, - 'branch': branch}, + 'branch': reqs_branch}, {'name': 'cinder', 'repository': cinder_repo, - 'branch': branch}, + 'branch': cinder_branch}, ], # Most tests use /mnt/openstack-git but cinder's using /dev/vdb # to store block devices so leave /mnt alone. From d05aa0c2ed148973fd0cd02496894c051f086824 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Mon, 13 Jul 2015 13:05:48 +0000 Subject: [PATCH 6/8] More amulet deploy from source branch fixups. --- tests/basic_deployment.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 5ecb3770..8975a6c9 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -72,18 +72,16 @@ class CinderBasicDeployment(OpenStackAmuletDeployment): if self.git: amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY') + reqs_repo = 'git://github.com/openstack/requirements' + cinder_repo = 'git://github.com/openstack/cinder' if self._get_openstack_release() == self.trusty_icehouse: reqs_repo = 'git://github.com/coreycb/requirements' - else: - reqs_repo = 'git://github.com/openstack/requirements' - cinder_repo = 'git://github.com/openstack/cinder' release = self._get_openstack_release_string() reqs_branch = 'stable/' + release + cinder_branch = 'stable/' + release if self._get_openstack_release() == self.trusty_icehouse: cinder_branch = release + '-eol' - else: - cinder_branch = 'stable/' + release openstack_origin_git = { 'repositories': [ From fa048bfbcd1c51386c1ad2e9aa1c09054b8fb597 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Mon, 13 Jul 2015 14:41:59 +0000 Subject: [PATCH 7/8] More amulet deploy from source branch fixups. --- tests/basic_deployment.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 8975a6c9..f6b0cb5d 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -76,12 +76,11 @@ class CinderBasicDeployment(OpenStackAmuletDeployment): cinder_repo = 'git://github.com/openstack/cinder' if self._get_openstack_release() == self.trusty_icehouse: reqs_repo = 'git://github.com/coreycb/requirements' + cinder_repo = 'git://github.com/coreycb/cinder' release = self._get_openstack_release_string() reqs_branch = 'stable/' + release cinder_branch = 'stable/' + release - if self._get_openstack_release() == self.trusty_icehouse: - cinder_branch = release + '-eol' openstack_origin_git = { 'repositories': [ From 7ad54c9b4875a4b55cd42e3d963fea0aebde38be Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Mon, 13 Jul 2015 16:07:29 +0000 Subject: [PATCH 8/8] More amulet deploy from source branch fixups. --- tests/basic_deployment.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index f6b0cb5d..3dee02fc 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -78,18 +78,16 @@ class CinderBasicDeployment(OpenStackAmuletDeployment): reqs_repo = 'git://github.com/coreycb/requirements' cinder_repo = 'git://github.com/coreycb/cinder' - release = self._get_openstack_release_string() - reqs_branch = 'stable/' + release - cinder_branch = 'stable/' + release + branch = 'stable/' + self._get_openstack_release_string() openstack_origin_git = { 'repositories': [ {'name': 'requirements', 'repository': reqs_repo, - 'branch': reqs_branch}, + 'branch': branch}, {'name': 'cinder', 'repository': cinder_repo, - 'branch': cinder_branch}, + 'branch': branch}, ], # Most tests use /mnt/openstack-git but cinder's using /dev/vdb # to store block devices so leave /mnt alone.