diff --git a/docs/packstack.rst b/docs/packstack.rst index e16a3d10c..020b9ddd0 100755 --- a/docs/packstack.rst +++ b/docs/packstack.rst @@ -988,12 +988,6 @@ Provisioning tempest config **CONFIG_PROVISION_TEMPEST_FLOATRANGE** CIDR network address for the floating IP subnet. -**CONFIG_PROVISION_TEMPEST_REPO_URI** - URI of the Integration Test Suite git repository. - -**CONFIG_PROVISION_TEMPEST_REPO_REVISION** - Revision (branch) of the Integration Test Suite git repository. - **CONFIG_RUN_TEMPEST** Specify 'y' to run Tempest smoke test as last step of installation. diff --git a/packstack/plugins/postscript_951.py b/packstack/plugins/postscript_951.py index d17527c06..fd4da8877 100644 --- a/packstack/plugins/postscript_951.py +++ b/packstack/plugins/postscript_951.py @@ -56,7 +56,7 @@ def run_tempest(config, messages): print("Running Tempest on %s" % config['CONFIG_TEMPEST_HOST']) server = utils.ScriptRunner(config['CONFIG_TEMPEST_HOST']) server.append('pushd /var/lib/tempest') - server.append('tox -eall \'(%s)\' -- --concurrency=2 > %s' + server.append('tempest run --regex \'(%s)\' --concurrency 2 > %s' % (config['CONFIG_RUN_TEMPEST_TESTS'].replace(' ', '|'), logfile)) server.append('popd') diff --git a/packstack/plugins/provision_700.py b/packstack/plugins/provision_700.py index 4ee98de40..c8a0dfcc2 100644 --- a/packstack/plugins/provision_700.py +++ b/packstack/plugins/provision_700.py @@ -253,31 +253,6 @@ def initConfig(controller): "NEED_CONFIRM": False, "CONDITION": False}, - {"CMD_OPTION": "provision-tempest-repo-uri", - "PROMPT": "What is the uri of the Tempest git repository?", - "OPTION_LIST": [], - "VALIDATORS": [validators.validate_not_empty], - "DEFAULT_VALUE": "https://github.com/openstack/tempest.git", - "MASK_INPUT": False, - "LOOSE_VALIDATION": True, - "CONF_NAME": "CONFIG_PROVISION_TEMPEST_REPO_URI", - "USE_DEFAULT": False, - "NEED_CONFIRM": False, - "CONDITION": False}, - - {"CMD_OPTION": "provision-tempest-repo-revision", - "PROMPT": ("What revision, branch, or tag of the Tempest git " - "repository should be used"), - "OPTION_LIST": [], - "VALIDATORS": [validators.validate_not_empty], - "DEFAULT_VALUE": "master", - "MASK_INPUT": False, - "LOOSE_VALIDATION": True, - "CONF_NAME": "CONFIG_PROVISION_TEMPEST_REPO_REVISION", - "USE_DEFAULT": False, - "NEED_CONFIRM": False, - "CONDITION": False}, - {"CMD_OPTION": "run-tempest", "PROMPT": ("Do you wish to run tempest?"), "OPTION_LIST": ["y", "n"], @@ -367,10 +342,7 @@ def initConfig(controller): # provision.pp needs them all. So we will initialize them with default # values params = [ - controller.getParamByName(x) - for x in ['CONFIG_PROVISION_TEMPEST_REPO_URI', - 'CONFIG_PROVISION_TEMPEST_REPO_REVISION', - 'CONFIG_PROVISION_OVS_BRIDGE'] + controller.getParamByName('CONFIG_PROVISION_OVS_BRIDGE') ] for param in params: value = controller.CONF.get(param.CONF_NAME, param.DEFAULT_VALUE) diff --git a/packstack/puppet/modules/packstack/manifests/provision/tempest.pp b/packstack/puppet/modules/packstack/manifests/provision/tempest.pp index 31ee6b29b..4450c05e5 100644 --- a/packstack/puppet/modules/packstack/manifests/provision/tempest.pp +++ b/packstack/puppet/modules/packstack/manifests/provision/tempest.pp @@ -49,10 +49,7 @@ class packstack::provision::tempest () $public_router_id = undef # Tempest - $tempest_repo_uri = hiera('CONFIG_PROVISION_TEMPEST_REPO_URI') - $tempest_repo_revision = hiera('CONFIG_PROVISION_TEMPEST_REPO_REVISION') - $tempest_clone_path = '/var/lib/tempest' - $tempest_clone_owner = 'root' + $tempest_workspace = '/var/lib/tempest' $tempest_user = hiera('CONFIG_PROVISION_TEMPEST_USER') $tempest_password = hiera('CONFIG_PROVISION_TEMPEST_USER_PW') @@ -125,10 +122,8 @@ class packstack::provision::tempest () resize_available => $resize_available, sahara_available => $sahara_available, swift_available => $swift_available, - tempest_clone_owner => $tempest_clone_owner, - tempest_clone_path => $tempest_clone_path, - tempest_repo_revision => $tempest_repo_revision, - tempest_repo_uri => $tempest_repo_uri, + tempest_workspace => $tempest_workspace, + install_from_source => false, tenant_name => $tenant_name, trove_available => $trove_available, username => $username, @@ -137,6 +132,6 @@ class packstack::provision::tempest () tempest_config { 'object-storage/operator_role': value => 'SwiftOperator', - path => "${tempest_clone_path}/etc/tempest.conf", + path => "${tempest_workspace}/etc/tempest.conf", } } diff --git a/releasenotes/notes/install-tempest-from-rpm-fd59c072011f372b.yaml b/releasenotes/notes/install-tempest-from-rpm-fd59c072011f372b.yaml new file mode 100644 index 000000000..07fce054e --- /dev/null +++ b/releasenotes/notes/install-tempest-from-rpm-fd59c072011f372b.yaml @@ -0,0 +1,5 @@ +--- +features: + - Install tempest from rpm. +deprecations: + - CONFIG_PROVISION_TEMPEST_REPO_URI and CONFIG_PROVISION_TEMPEST_REPO_REVISION options are removed. diff --git a/run_tests.sh b/run_tests.sh index 2cdad5fca..9825cb8eb 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -252,8 +252,8 @@ result=$? # Print output and generate subunit if results exist if [ -d /var/lib/tempest ]; then pushd /var/lib/tempest - $SUDO .tox/tempest/bin/testr last || true - $SUDO bash -c ".tox/tempest/bin/testr last --subunit > /var/tmp/packstack/latest/testrepository.subunit" || true + $SUDO /usr/bin/testr last || true + $SUDO bash -c "/usr/bin/testr last --subunit > /var/tmp/packstack/latest/testrepository.subunit" || true popd fi