summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRabi Mishra <ramishra@redhat.com>2022-06-30 10:54:34 +0530
committerTakashi Kajinami <tkajinam@redhat.com>2022-07-01 15:14:24 +0000
commit75815c4ac3683ec5661b910bb354956a26c2dfd2 (patch)
tree1200225f103f80895ad2141e27107ce42c10d912
parent09441e4d4cf72e3bfe4dcf7f11d30a0c4e631614 (diff)
downloadheat-75815c4ac3683ec5661b910bb354956a26c2dfd2.tar.gz
Use constraints when creating venv for grenade
As a followup for change I6a8cffdc86c895eebe4269c5cd37841325566c54 let's use branch specific upper constraints when running tests in grenade. Change-Id: I71f8398b6aa57b7c1910750b8e048825383e3d9a (cherry picked from commit 39d653fa5741e45d26388950270e7ed3ca489b89) (cherry picked from commit 976bcf9ef34014cdd5cf15f97243609c96ac8ee8)
-rw-r--r--.zuul.yaml2
-rwxr-xr-xdevstack/upgrade/resources.sh6
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