aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVu Tran <vu.tran@windriver.com>2014-07-10 10:23:50 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-07-17 00:12:13 -0400
commite2683e0335c6166dd8fc34d1c3656738a9e8518e (patch)
treef5ec0b81688171fcc9eb53d9c68d510d130f6c12
parentbe73f6602bb607cb1c4c0ea504d02f523006b648 (diff)
downloadmeta-cloud-services-e2683e0335c6166dd8fc34d1c3656738a9e8518e.tar.gz
meta-cloud-services-e2683e0335c6166dd8fc34d1c3656738a9e8518e.tar.bz2
meta-cloud-services-e2683e0335c6166dd8fc34d1c3656738a9e8518e.zip
Rally verification to use existing tempest
By default, Rally verification requires to do following things: * git clone tempest source from upstream * setup virtualenv for this tempest * setup testr environment with virtualenv above * create tempest.conf for this tempest If tempest is already installed/configured in rootfs then force Rally to use this existing tempest. A new introduced option "existing_tempest_config" in /etc/rally/rally.conf can be used to configure Rally to either use the existing tempest or to download from upstream. If the option "existing_tempest_config" is not set then follows the default path. If existing_tempest_config is set to absolute path of tempest config folder (which contains tempest "tools" and .testr.conf) then Rally uses this existing tempest. Signed-off-by: Vu Tran <vu.tran@windriver.com>
-rw-r--r--meta-openstack/recipes-devtools/python/python-rally/rally.conf4
-rw-r--r--meta-openstack/recipes-devtools/python/python-rally/verification-to-use-existing-tempest.patch122
-rw-r--r--meta-openstack/recipes-devtools/python/python-rally_git.bb1
3 files changed, 127 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-rally/rally.conf b/meta-openstack/recipes-devtools/python/python-rally/rally.conf
index 1c1f864..bc74be7 100644
--- a/meta-openstack/recipes-devtools/python/python-rally/rally.conf
+++ b/meta-openstack/recipes-devtools/python/python-rally/rally.conf
@@ -1,5 +1,9 @@
[DEFAULT]
+# Inform Rally to use existing tempest instead of
+# dynamically installing tempest from internet
+existing_tempest_config=/etc/tempest/
+
#
# Options defined in rally.exceptions
#
diff --git a/meta-openstack/recipes-devtools/python/python-rally/verification-to-use-existing-tempest.patch b/meta-openstack/recipes-devtools/python/python-rally/verification-to-use-existing-tempest.patch
new file mode 100644
index 0000000..4923c37
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-rally/verification-to-use-existing-tempest.patch
@@ -0,0 +1,122 @@
+verification: to use existing tempest
+
+By default, Rally verification requires to do
+following things:
+
+* git clone tempest source from upstream
+* setup virtualenv for this tempest
+* setup testr environement with virtualenv above
+* create tempest.conf for this tempest
+
+If tempest is already installed/configured in rootfs
+then force Rally to use this existing tempest.
+
+If the option "existing_tempest_config" in /etc/rally/rally.conf
+is not set then follows the default path. If existing_tempest_config
+is set to absolute path of tempest config folder (which
+contains tempest "tools" amd .testr.conf) then Rally
+uses this existing tempest.
+
+Signed-off-by: Vu Tran <vu.tran@windriver.com>
+
+diff --git a/rally/orchestrator/api.py b/rally/orchestrator/api.py
+index d0cc769..644c16b 100644
+--- a/rally/orchestrator/api.py
++++ b/rally/orchestrator/api.py
+@@ -143,8 +143,11 @@ def verify(deploy_id, set_name, regex):
+ verification = objects.Verification(deployment_uuid=deploy_id)
+ verifier = tempest.Tempest(deploy_id, verification=verification)
+ if not verifier.is_installed():
+- print("Tempest is not installed for specified deployment.")
+- print("Installing Tempest for deployment %s" % deploy_id)
++ if tempest.CONF.existing_tempest_config is None:
++ print("Tempest is not installed for specified deployment.")
++ print("Installing Tempest for deployment %s" % deploy_id)
++ else:
++ print("Configuring existing Tempest for deployment %s" % deploy_id)
+ verifier.install()
+ LOG.info("Starting verification of deployment: %s" % deploy_id)
+
+diff --git a/rally/verification/verifiers/tempest/tempest.py b/rally/verification/verifiers/tempest/tempest.py
+index 13a829d..428af49 100644
+--- a/rally/verification/verifiers/tempest/tempest.py
++++ b/rally/verification/verifiers/tempest/tempest.py
+@@ -25,9 +25,17 @@ from rally.openstack.common import jsonutils
+ from rally import utils
+ from rally.verification.verifiers.tempest import config
+ from rally.verification.verifiers.tempest import subunit2json
++from oslo.config import cfg
+
+ LOG = logging.getLogger(__name__)
+
++CONF = cfg.CONF
++CONF.register_opts([
++ cfg.StrOpt("existing_tempest_config", default=None,
++ help="Path to existing tempest config folder, this path "
++ "should contain \"tools\" folder and .testr.conf file")
++])
++
+
+ class Tempest(object):
+
+@@ -41,8 +49,11 @@ class Tempest(object):
+ "for-deployment-%s" % deploy_id)
+ self.config_file = os.path.join(self.tempest_path, "tempest.conf")
+ self.log_file_raw = os.path.join(self.tempest_path, "subunit.stream")
+- self.venv_wrapper = os.path.join(self.tempest_path,
++ if CONF.existing_tempest_config is None:
++ self.venv_wrapper = os.path.join(self.tempest_path,
+ "tools/with_venv.sh")
++ else:
++ self.venv_wrapper = ""
+ self.verification = verification
+ self._env = None
+
+@@ -62,6 +73,9 @@ class Tempest(object):
+ return self._env
+
+ def _install_venv(self):
++ if CONF.existing_tempest_config is not None:
++ open(os.path.join(self.tempest_path, '.venv'), 'w').close()
++ return
+ if not os.path.isdir(os.path.join(self.tempest_path, '.venv')):
+ LOG.info("No virtual environment found...Install the virtualenv.")
+ LOG.debug("Virtual environment directory: %s" %
+@@ -111,10 +125,13 @@ class Tempest(object):
+ def install(self):
+ if not self.is_installed():
+ try:
+- if not os.path.exists(Tempest.tempest_base_path):
++ if CONF.existing_tempest_config is None and \
++ not os.path.exists(Tempest.tempest_base_path):
+ Tempest._clone()
+-
+- if not os.path.exists(self.tempest_path):
++ if CONF.existing_tempest_config is not None:
++ shutil.copytree(CONF.existing_tempest_config,
++ self.tempest_path)
++ elif not os.path.exists(self.tempest_path):
+ shutil.copytree(Tempest.tempest_base_path,
+ self.tempest_path)
+ subprocess.check_call("git checkout master; "
+@@ -128,7 +145,10 @@ class Tempest(object):
+ self.uninstall()
+ raise exceptions.TempestSetupFailure("failed cmd: '%s'", e.cmd)
+ else:
+- print("Tempest has been successfully installed!")
++ if CONF.existing_tempest_config is None:
++ print("Tempest has been successfully installed!")
++ else:
++ print("Verifier has been successfully configured to use existing Tempest")
+
+ else:
+ print("Tempest is already installed")
+@@ -139,7 +159,7 @@ class Tempest(object):
+
+ @utils.log_verification_wrapper(LOG.info, _("Run verification."))
+ def _prepare_and_run(self, set_name, regex):
+- if not self.is_configured():
++ if CONF.existing_tempest_config is None and not self.is_configured():
+ self.generate_config_file()
+
+ if set_name == "full":
diff --git a/meta-openstack/recipes-devtools/python/python-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb
index 77c140a..2a83457 100644
--- a/meta-openstack/recipes-devtools/python/python-rally_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-rally_git.bb
@@ -15,6 +15,7 @@ SRC_URI = "git://github.com/stackforge/${SRCNAME}.git;branch=master \
file://task-example.json \
file://deployment-existing.json \
file://remove-ironic-support.patch \
+ file://verification-to-use-existing-tempest.patch \
"
SRCREV="b297cf00750f263b8b5bdeb71f6952f672e87f5a"