diff options
| author | Zuul <zuul@review.opendev.org> | 2022-07-29 16:18:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-07-29 16:18:36 +0000 |
| commit | e69a96d7cea627ce9bd6b8668743ff025cbb7669 (patch) | |
| tree | db127a972b2865d2b15511206a612ff1cf27787b | |
| parent | b8b77a0243db8988b2fefb3dda606d29784d26df (diff) | |
| parent | 94cc394fe4311f462dcbab24e68761644e60d01b (diff) | |
| download | heat-e69a96d7cea627ce9bd6b8668743ff025cbb7669.tar.gz | |
Merge "Make grenade job voting again" into stable/train
| -rw-r--r-- | .zuul.yaml | 3 | ||||
| -rwxr-xr-x | devstack/upgrade/resources.sh | 25 |
2 files changed, 6 insertions, 22 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index caa97c815..4464c0d88 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -65,7 +65,6 @@ - job: name: grenade-heat parent: grenade - voting: false required-projects: - opendev.org/openstack/heat - opendev.org/openstack/heat-tempest-plugin @@ -78,7 +77,7 @@ h-eng: true heat: true # We do run a list of tests after upgrade. This is just to bypass the req from parent. - tempest_test_regex: ^heat_tempest_plugin\.tests\.functional\.test_nova_server_networks + tempest_test_regex: ^tempest\.api\.identity\.v3\.test_tokens tox_envlist: all devstack_plugins: heat: https://opendev.org/openstack/heat diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh index 4aac84d58..65d87a83a 100755 --- a/devstack/upgrade/resources.sh +++ b/devstack/upgrade/resources.sh @@ -65,26 +65,11 @@ function _run_heat_integrationtests { # Run set of specified functional tests UPGRADE_TESTS=upgrade_tests.list _write_heat_integrationtests $UPGRADE_TESTS - - # NOTE(gmann): If devstack is pinned to use the non master - # Tempest and constraints for Tempest venv then use the same - # while running the tests too otherwise, it will recreate - # the Tempest venv due to constraints mismatch. - # recreation of Tempest venv can flush the initially installed - # tempest plugins and their deps. - if [[ $use_stable_constraints == "True" ]]; then - echo "Using $DEST/requirements/upper-constraints.txt constraints in Tempest venv." - # NOTE: setting both tox env var and once Tempest start using new var - # TOX_CONSTRAINTS_FILE then we can remove the old one. - export UPPER_CONSTRAINTS_FILE=$DEST/requirements/upper-constraints.txt - export TOX_CONSTRAINTS_FILE=$UPPER_CONSTRAINTS_FILE - else - echo "Using master constraints in Tempest venv." - # NOTE: setting both tox env var and once Tempest start using new var - # TOX_CONSTRAINTS_FILE then we can remove the old one. - export UPPER_CONSTRAINTS_FILE=https://releases.openstack.org/constraints/upper/master - export TOX_CONSTRAINTS_FILE=$UPPER_CONSTRAINTS_FILE - fi + export UPPER_CONSTRAINTS_FILE=$DEST/requirements/upper-constraints.txt + export TOX_CONSTRAINTS_FILE=$UPPER_CONSTRAINTS_FILE + export HEAT_TEMPEST_PLUGIN=$DEST/heat-tempest-plugin + sudo git config --system --add safe.directory $HEAT_TEMPEST_PLUGIN + tox -evenv-tempest -- pip install -c$UPPER_CONSTRAINTS_FILE $HEAT_TEMPEST_PLUGIN tox -evenv-tempest -- stestr --test-path=$DEST/heat/heat_integrationtests --top-dir=$DEST/heat \ --group_regex='heat_tempest_plugin\.tests\.api\.test_heat_api[._]([^_]+)' \ run --whitelist-file $UPGRADE_TESTS |