Make grenade job voting again

Because change I7d1017bcd7147329c4e187336daee1a1ae280fa9 was backported
to the previous stable branch.

Backport note:
This includes the following follow-up commit.

(commit fee8c40c23)
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: I2de594258231e3f1c217904afce88a83a8f94df3
(cherry picked from commit fee8c40c23)
(cherry picked from commit 03e4f9af62)
(cherry picked from commit e3ec8946b3)
(cherry picked from commit b4d159b87e)
This commit is contained in:
Takashi Kajinami 2022-06-03 16:35:56 +09:00
parent ddc926b632
commit d7582f0032
2 changed files with 6 additions and 3 deletions

View File

@ -140,7 +140,6 @@
- opendev.org/openstack/heat
- opendev.org/openstack/heat-tempest-plugin
- opendev.org/openstack/python-heatclient
voting: false
vars:
configure_swap_size: 8192
devstack_services:
@ -149,7 +148,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

View File

@ -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