grenade: re-enable, really test rocky->master
So far grenade has been testing a queens->rocky upgrade. Implement the grenade code required to upgrade to the current master. The plugin code installs the split plugins, which need to be listed in the PROJECTS variable in order to be cloned. Also, don't deploy sahara-all even when deploying rocky (it was already deprecated back then). Finally, deploying sahara-api using wsgi has been the default for a while and for sure when the upgrade starts from rocky there is no need to disable it. The grenade test should be stable enough again, so re-enable it in both the check and the gate queue. Change-Id: I000aae6c093c32ab1c3505448e2b9ec52b0529a2
This commit is contained in:
parent
f0a1cc99d0
commit
8010e24a56
13
.zuul.yaml
13
.zuul.yaml
|
@ -19,8 +19,7 @@
|
|||
- sahara-tests-tempest-v2
|
||||
- openstack-tox-cover:
|
||||
voting: false
|
||||
- sahara-grenade:
|
||||
voting: false
|
||||
- sahara-grenade
|
||||
gate:
|
||||
queue: sahara
|
||||
jobs:
|
||||
|
@ -28,9 +27,7 @@
|
|||
- sahara-tests-scenario-v2
|
||||
- sahara-tests-tempest
|
||||
- sahara-tests-tempest-v2
|
||||
- sahara-grenade:
|
||||
voting: false
|
||||
|
||||
- sahara-grenade
|
||||
experimental:
|
||||
jobs:
|
||||
- sahara-buildimages-ambari
|
||||
|
@ -55,6 +52,12 @@
|
|||
- openstack/heat-tempest-plugin
|
||||
- openstack/python-heatclient
|
||||
- openstack/sahara-tests
|
||||
- openstack/sahara-plugin-ambari
|
||||
- openstack/sahara-plugin-cdh
|
||||
- openstack/sahara-plugin-mapr
|
||||
- openstack/sahara-plugin-spark
|
||||
- openstack/sahara-plugin-storm
|
||||
- openstack/sahara-plugin-vanilla
|
||||
irrelevant-files:
|
||||
- ^(test-|)requirements.txt$
|
||||
- ^.*\.rst$
|
||||
|
|
|
@ -264,8 +264,6 @@ function start_sahara {
|
|||
restart_apache_server
|
||||
tail_log sahara-api /var/log/$APACHE_NAME/sahara-api.log
|
||||
else
|
||||
run_process sahara-all "$SAHARA_BIN_DIR/sahara-all \
|
||||
--config-file $SAHARA_CONF_FILE"
|
||||
run_process sahara-api "$SAHARA_BIN_DIR/sahara-api \
|
||||
--config-file $SAHARA_CONF_FILE"
|
||||
fi
|
||||
|
@ -312,8 +310,7 @@ function stop_sahara {
|
|||
# correctly throughout devstack.
|
||||
function is_sahara_enabled {
|
||||
if is_service_enabled sahara-api || \
|
||||
is_service_enabled sahara-eng || \
|
||||
is_service_enabled sahara-all; then
|
||||
is_service_enabled sahara-eng; then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# ``upgrade-sahara``
|
||||
|
||||
function configure_sahara_upgrade {
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
set -o xtrace
|
||||
|
||||
install_ambari
|
||||
install_cdh
|
||||
install_mapr
|
||||
install_spark
|
||||
install_storm
|
||||
install_vanilla
|
||||
|
||||
# reset to previous state
|
||||
$XTRACE
|
||||
}
|
|
@ -7,10 +7,10 @@ devstack_localrc base IMAGE_URLS=\
|
|||
http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
|
||||
devstack_localrc base enable_plugin sahara \
|
||||
git://git.openstack.org/openstack/sahara \
|
||||
stable/queens
|
||||
stable/rocky
|
||||
devstack_localrc base enable_plugin heat \
|
||||
git://git.openstack.org/openstack/heat \
|
||||
stable/queens
|
||||
stable/rocky
|
||||
devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
|
||||
devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
|
||||
|
||||
|
@ -23,4 +23,3 @@ devstack_localrc target enable_plugin heat \
|
|||
git://git.openstack.org/openstack/heat
|
||||
devstack_localrc target LIBS_FROM_GIT=python-saharaclient
|
||||
devstack_localrc target DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
|
||||
devstack_localrc target SAHARA_USE_MOD_WSGI="False"
|
||||
|
|
|
@ -45,11 +45,18 @@
|
|||
export PROJECTS="openstack/heat-tempest-plugin $PROJECTS"
|
||||
export PROJECTS="openstack/python-heatclient $PROJECTS"
|
||||
export PROJECTS="openstack/sahara-tests $PROJECTS"
|
||||
export PROJECTS="openstack/sahara-plugin-ambari $PROJECTS"
|
||||
export PROJECTS="openstack/sahara-plugin-cdh $PROJECTS"
|
||||
export PROJECTS="openstack/sahara-plugin-mapr $PROJECTS"
|
||||
export PROJECTS="openstack/sahara-plugin-spark $PROJECTS"
|
||||
export PROJECTS="openstack/sahara-plugin-storm $PROJECTS"
|
||||
export PROJECTS="openstack/sahara-plugin-vanilla $PROJECTS"
|
||||
export PYTHONUNBUFFERED=true
|
||||
export GRENADE_PLUGINRC="enable_grenade_plugin sahara https://git.openstack.org/openstack/sahara"
|
||||
export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin heat https://git.openstack.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
|
||||
|
|
Loading…
Reference in New Issue