diff options
| author | Takashi Kajinami <tkajinam@redhat.com> | 2022-06-03 16:35:56 +0900 |
|---|---|---|
| committer | Takashi Kajinami <tkajinam@redhat.com> | 2022-07-05 08:34:42 +0000 |
| commit | d7582f0032e753fdee9f5b12f17d66fd89aa4e85 (patch) | |
| tree | 21d2f687e2efae29acbe17184ece6842c4a47ae7 | |
| parent | ddc926b6321a170ca02dc014b6a812957d487feb (diff) | |
| download | heat-d7582f0032e753fdee9f5b12f17d66fd89aa4e85.tar.gz | |
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 fee8c40c23fb160a4fe64e95a71f827528287690)
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 fee8c40c23fb160a4fe64e95a71f827528287690)
(cherry picked from commit 03e4f9af62ed66a4df72f5da793f8ce4caf8ac3e)
(cherry picked from commit e3ec8946b3de50c76b2c3b08c2f7356842d3f45a)
(cherry picked from commit b4d159b87e606024d65bb285576c64bd1c72fecd)
| -rw-r--r-- | .zuul.yaml | 3 | ||||
| -rwxr-xr-x | devstack/upgrade/resources.sh | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index c7903e3f5..ec512fb7e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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 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 |