diff options
| author | Zuul <zuul@review.opendev.org> | 2022-07-05 07:01:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-07-05 07:01:47 +0000 |
| commit | da754193b4f361a3b3e2f2bfa147f19995b9f8ef (patch) | |
| tree | 458f5a913938b26dd53e8fae28b3999d3be5f2e1 | |
| parent | b8d09f347c2d478e7d69c940152a4d85fbc58f7c (diff) | |
| parent | 75815c4ac3683ec5661b910bb354956a26c2dfd2 (diff) | |
| download | heat-da754193b4f361a3b3e2f2bfa147f19995b9f8ef.tar.gz | |
Merge "Use constraints when creating venv for grenade" into stable/xena
| -rw-r--r-- | .zuul.yaml | 2 | ||||
| -rwxr-xr-x | devstack/upgrade/resources.sh | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index 12b7d2169..7bcebe743 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -153,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 |