grenade: start from stein, disable heat integration tests

- set the starting point as stein and the destination to train
  (to be adapted in the backports of this patch);
- heat tests should have been disabled already here;
  they are really flaky, they takes more time and they should be
  tested by heat.

Change-Id: I5571ac5e578f98465737373598b358aa7dab93e0
(cherry picked from commit 810d94bfbb)
This commit is contained in:
Luigi Toscano 2019-10-10 00:51:25 +02:00
parent 62b4c626c9
commit 244ee200d4
2 changed files with 7 additions and 6 deletions

View File

@ -7,19 +7,20 @@ devstack_localrc base IMAGE_URLS=\
http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
devstack_localrc base enable_plugin sahara \
https://opendev.org/openstack/sahara \
stable/rocky
stable/stein
devstack_localrc base enable_plugin heat \
https://opendev.org/openstack/heat \
stable/rocky
devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
stable/stein
devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
devstack_localrc target IMAGE_URLS=\
"http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz,\
http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
devstack_localrc target enable_plugin sahara \
https://opendev.org/openstack/sahara
https://opendev.org/openstack/sahara \
stable/train
devstack_localrc target enable_plugin heat \
https://opendev.org/openstack/heat
https://opendev.org/openstack/heat \
stable/train
devstack_localrc target LIBS_FROM_GIT=python-saharaclient
devstack_localrc target DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"

View File

@ -29,6 +29,7 @@
set -x
cat << 'EOF' >>"/tmp/dg-local.conf"
[[local|localrc]]
RUN_HEAT_INTEGRATION_TESTS=False
TEMPEST_PLUGINS+=' ../heat-tempest-plugin ../sahara-tests'
EOF
executable: /bin/bash
@ -56,7 +57,6 @@
export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin heat https://opendev.org/openstack/heat"
export DEVSTACK_GATE_NEUTRON=1
export RUN_HEAT_INTEGRATION_TESTS=False
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_REGEX="sahara_tempest_plugin.tests.api"
export DEVSTACK_GATE_GRENADE=pullup