diff options
| author | Zuul <zuul@review.opendev.org> | 2022-07-01 10:33:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-07-01 10:33:42 +0000 |
| commit | ead034672007637a8ae84eb08bc19d880b6cc3f8 (patch) | |
| tree | 04e6530bad754d551974e14251acdd4f80f785a1 | |
| parent | 567615f6fcaa3a698140d25a850f1ba884b401b0 (diff) | |
| parent | 39d653fa5741e45d26388950270e7ed3ca489b89 (diff) | |
| download | heat-ead034672007637a8ae84eb08bc19d880b6cc3f8.tar.gz | |
Merge "Use constraints when creating venv for grenade"
| -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 8039ad9fb..233dc0d95 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -150,7 +150,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 |