diff options
| author | Zuul <zuul@review.opendev.org> | 2022-07-05 12:01:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-07-05 12:01:40 +0000 |
| commit | c2bc23bb5c6c0b4f45c4cc7b3da9e6a5c017c79b (patch) | |
| tree | 2d9962baece7bdfaf603acbe349607f150b2c881 | |
| parent | 667b8865d51e4c9f6685cee27bf578de4609bf88 (diff) | |
| parent | b4d159b87e606024d65bb285576c64bd1c72fecd (diff) | |
| download | heat-c2bc23bb5c6c0b4f45c4cc7b3da9e6a5c017c79b.tar.gz | |
Merge "Make grenade job voting again" into stable/wallaby
| -rw-r--r-- | .zuul.yaml | 3 | ||||
| -rwxr-xr-x | devstack/upgrade/resources.sh | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index 2bf97f2ed..4101a4271 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -140,7 +140,6 @@ - opendev.org/openstack/heat - opendev.org/openstack/heat-tempest-plugin - opendev.org/openstack/python-heatclient - voting: false vars: grenade_devstack_localrc: shared: @@ -154,7 +153,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 1b7be42ee..4e7c26e16 100755 --- a/devstack/upgrade/resources.sh +++ b/devstack/upgrade/resources.sh @@ -64,7 +64,11 @@ function _run_heat_integrationtests { # Run set of specified functional tests UPGRADE_TESTS=upgrade_tests.list _write_heat_integrationtests $UPGRADE_TESTS - + 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 |