diff options
| author | ricolin <rico.lin.guanyu@gmail.com> | 2020-02-13 18:28:13 +0800 |
|---|---|---|
| committer | ricolin <rico.lin.guanyu@gmail.com> | 2020-02-16 20:40:15 +0800 |
| commit | de0dca13b3dcc26a5a565ccbf99ac21e25615f04 (patch) | |
| tree | 9ab067214ff79461bc5006703b82abcd610d14f1 | |
| parent | 0f4d62e716ef99b819e504b5b4b4046179e8dd03 (diff) | |
| download | heat-de0dca13b3dcc26a5a565ccbf99ac21e25615f04.tar.gz | |
Use stable constraint for Tempest pinned stable branches
Stable branches till stable/rocky is using python
version <py3.6. Tempest test those branch in venv
but Tempest tox use the master upper-constraint[1]
which block installation due to dependencies
require >=py3.6. For exmaple, oslo.concurrency 4.0.0
is not compatible for <py3.6.
As we pin Tempest for EM stable brach, we should be
able to use stable constraint for Tempest installation
as well as while running during run-tempest playbook.
tox.ini is hard coded to use master constraint[1] which force
run-tempest to recreate the tox env and use the master constraint.
Fix for that- https://review.opendev.org/#/c/705870/
[1] https://opendev.org/openstack/tempest/src/commit/bc9fe8eca801f54915ff3eafa418e6e18ac2df63/tox.ini#L14
Depends-On: https://review.opendev.org/707665
Change-Id: Id5f5b6b0c1b1d925e5ee041120fbaf20e891d4c4
| -rwxr-xr-x | devstack/upgrade/resources.sh | 3 | ||||
| -rwxr-xr-x | heat_integrationtests/post_test_hook.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh index 6057324e7..60cf32d78 100755 --- a/devstack/upgrade/resources.sh +++ b/devstack/upgrade/resources.sh @@ -78,7 +78,8 @@ function _run_heat_integrationtests { UPGRADE_TESTS=upgrade_tests.list _write_heat_integrationtests $UPGRADE_TESTS - tox -evenv-tempest -- stestr --test-path=$DEST/heat/heat_integrationtests --top-dir=$DEST/heat \ + export UPPER_CONSTRAINTS_FILE=${UPPER_CONSTRAINTS_FILE:-$DEST/requirements/upper-constraints.txt} + UPPER_CONSTRAINTS_FILE=$UPPER_CONSTRAINTS_FILE 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 _heat_set_user diff --git a/heat_integrationtests/post_test_hook.sh b/heat_integrationtests/post_test_hook.sh index 80e017937..b7af9e75f 100755 --- a/heat_integrationtests/post_test_hook.sh +++ b/heat_integrationtests/post_test_hook.sh @@ -21,6 +21,7 @@ sudo -E $DEST/heat/heat_integrationtests/prepare_test_env.sh sudo -E $DEST/heat/heat_integrationtests/prepare_test_network.sh cd $DEST/tempest -sudo 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 +export UPPER_CONSTRAINTS_FILE=${UPPER_CONSTRAINTS_FILE:-$DEST/requirements/upper-constraints.txt} +sudo UPPER_CONSTRAINTS_FILE=$UPPER_CONSTRAINTS_FILE 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 sudo -E $DEST/heat/heat_integrationtests/cleanup_test_env.sh |