Merge "Support for the new Devstack plugin model in Rally"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
930470759f
|
|
@ -58,7 +58,7 @@
|
|||
export DEVSTACK_GATE_TIMEOUT=120
|
||||
export RALLY_SCENARIO={scenario}
|
||||
|
||||
ENABLED_SERVICES=rally,sahara,key,horizon,
|
||||
ENABLED_SERVICES=sahara,key,horizon,
|
||||
ENABLED_SERVICES+=cinder,c-api,c-vol,c-sch,c-bak
|
||||
ENABLED_SERVICES+=g-api,g-reg,
|
||||
ENABLED_SERVICES+=heat,h-api,h-api-cfn,h-api-cw,h-eng,
|
||||
|
|
@ -72,12 +72,21 @@
|
|||
fi
|
||||
export ENABLED_SERVICES
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
}}
|
||||
export -f pre_test_hook
|
||||
# TODO(mrostecki): Remove this if statement after implementing
|
||||
# Devstack plugin in Rally.
|
||||
if [ -d $BASE/new/rally/devstack ]; then
|
||||
# New-style Devstack integration
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||
else
|
||||
# Old-style Devstack integration
|
||||
ENABLED_SERVICES+=rally,
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
}}
|
||||
export -f pre_test_hook
|
||||
fi
|
||||
function post_test_hook {{
|
||||
$BASE/new/rally/tests/ci/rally-gate.sh
|
||||
}}
|
||||
|
|
@ -105,20 +114,36 @@
|
|||
export DEVSTACK_GATE_TIMEOUT=120
|
||||
export RALLY_SCENARIO={scenario}
|
||||
|
||||
ENABLED_SERVICES=rally,ceilometer-acompute,ceilometer-acentral,ceilometer-api,
|
||||
ENABLED_SERVICES=ceilometer-acompute,ceilometer-acentral,ceilometer-api,
|
||||
ENABLED_SERVICES+=ceilometer-anotification,ceilometer-collector,
|
||||
ENABLED_SERVICES+=ceilometer-alarm-evaluator,ceilometer-alarm-notifier,
|
||||
ENABLED_SERVICES+=designate,designate-api,designate-central,designate-sink,designate-mdns,
|
||||
|
||||
export ENABLED_SERVICES
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
# Install designate-devstack integration
|
||||
cd /opt/stack/new/designate/contrib/devstack
|
||||
./pre_test_hook.sh
|
||||
}}
|
||||
# TODO(mrostecki): Remove this if statement after implementing
|
||||
# Devstack plugin in Rally.
|
||||
if [ -d $BASE/new/rally/devstack ]; then
|
||||
# New-style Devstack integration
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install designate-devstack integration
|
||||
cd /opt/stack/new/designate/contrib/devstack
|
||||
./pre_test_hook.sh
|
||||
}}
|
||||
else
|
||||
# Old-style Devstack integration
|
||||
ENABLED_SERVICES+=rally,
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
# Install designate-devstack integration
|
||||
cd /opt/stack/new/designate/contrib/devstack
|
||||
./pre_test_hook.sh
|
||||
}}
|
||||
fi
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {{
|
||||
|
|
@ -143,19 +168,32 @@
|
|||
export DEVSTACK_GATE_TIMEOUT=60
|
||||
export RALLY_SCENARIO={scenario}
|
||||
|
||||
export ENABLED_SERVICES+=rally,
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
|
||||
|
||||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
# Install manila-devstack integration
|
||||
# 'dhss' means 'drivers handle share servers'
|
||||
source $BASE/new/manila/contrib/ci/pre_test_hook.sh {dhss}
|
||||
}}
|
||||
# TODO(mrostecki): Remove this if statement after implementing
|
||||
# Devstack plugin in Rally.
|
||||
if [ -d $BASE/new/rally/devstack ]; then
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install manila-devstack integration
|
||||
# 'dhss' means 'drivers handle share servers'
|
||||
source $BASE/new/manila/contrib/ci/pre_test_hook.sh {dhss}
|
||||
}}
|
||||
else
|
||||
# Old-style Devstack integration
|
||||
ENABLED_SERVICES+=rally,
|
||||
function pre_test_hook {{
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
# Install manila-devstack integration
|
||||
# 'dhss' means 'drivers handle share servers'
|
||||
source $BASE/new/manila/contrib/ci/pre_test_hook.sh {dhss}
|
||||
}}
|
||||
fi
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {{
|
||||
|
|
@ -225,17 +263,33 @@
|
|||
export DEVSTACK_GATE_TIMEOUT=120
|
||||
export RALLY_SCENARIO={scenario}
|
||||
|
||||
ENABLED_SERVICES=rally,h-api,h-api-cfn,h-api-cw,h-eng,heat,
|
||||
ENABLED_SERVICES=h-api,h-api-cfn,h-api-cw,h-eng,heat,
|
||||
ENABLED_SERVICES+=murano,murano-api,murano-engine,
|
||||
export ENABLED_SERVICES
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
# Install murano-devstack integration
|
||||
cd /opt/stack/new/murano/functionaltests
|
||||
./pre_test_hook.sh
|
||||
}}
|
||||
# TODO(mrostecki): Remove this if statement after implementing
|
||||
# Devstack plugin in Rally.
|
||||
if [ -d $BASE/new/rally/devstack ]; then
|
||||
# New-style Devstack integration
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install murano-devstack integration
|
||||
cd /opt/stack/new/murano/functionaltests
|
||||
./pre_test_hook.sh
|
||||
}}
|
||||
else
|
||||
# Old-style Devstack integration
|
||||
ENABLED_SERVICES+=rally,
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
# Install murano-devstack integration
|
||||
cd /opt/stack/new/murano/functionaltests
|
||||
./pre_test_hook.sh
|
||||
}}
|
||||
fi
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {{
|
||||
|
|
@ -264,16 +318,31 @@
|
|||
export DEVSTACK_GATE_TIMEOUT=120
|
||||
export RALLY_SCENARIO={scenario}
|
||||
|
||||
export ENABLED_SERVICES=mistral,rally,h-api,h-api-cfn,h-api-cw,h-eng,heat
|
||||
export ENABLED_SERVICES=mistral,h-api,h-api-cfn,h-api-cw,h-eng,heat,
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
# TODO(mrostecki): Remove this if statement after implementing
|
||||
# Devstack plugin in Rally.
|
||||
if [ -d $BASE/new/rally/devstack ]; then
|
||||
# New-style Devstack integration
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||
|
||||
# Install mistral-devstack integration
|
||||
cd /opt/stack/new/mistral/functionaltests
|
||||
./pre_test_hook.sh
|
||||
}}
|
||||
function pre_test_hook {{
|
||||
# Install mistral-devstack integration
|
||||
cd /opt/stack/new/mistral/functionaltests
|
||||
./pre_test_hook.sh
|
||||
}}
|
||||
else
|
||||
# Old-style Devstack integration
|
||||
ENABLED_SERVICES+=rally,
|
||||
|
||||
function pre_test_hook {{
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
# Install mistral-devstack integration
|
||||
cd /opt/stack/new/mistral/functionaltests
|
||||
./pre_test_hook.sh
|
||||
}}
|
||||
fi
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {{
|
||||
|
|
@ -470,12 +539,23 @@
|
|||
- shell: |
|
||||
#/bin/bash -xe
|
||||
export PROJECTS="openstack/rally $PROJECTS"
|
||||
export ENABLED_SERVICES=rally
|
||||
|
||||
function pre_test_hook {
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
}
|
||||
# TODO(mrostecki): Remove this if statement after implementing
|
||||
# Devstack plugin in Rally.
|
||||
if [ -d $BASE/new/rally/devstack ]; then
|
||||
# New-style Devstack integration
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||
else
|
||||
# Old-style Devstack integration
|
||||
export ENABLED_SERVICES=rally,
|
||||
|
||||
function pre_test_hook {
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
}
|
||||
export -f pre_test_hook
|
||||
fi
|
||||
|
||||
function post_test_hook {
|
||||
cd $BASE/new/rally
|
||||
sudo -H -u stack tox -ecli -v
|
||||
|
|
@ -485,7 +565,6 @@
|
|||
cp -r $BASE/new/rally/rally-cli-output-files $WORKSPACE/
|
||||
return $EXIT_CODE
|
||||
}
|
||||
export -f pre_test_hook
|
||||
export -f post_test_hook
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
|
|
@ -521,13 +600,22 @@
|
|||
export PROJECTS="openstack/rally $PROJECTS"
|
||||
export DEVSTACK_GATE_EXERCISES=0
|
||||
export DEVSTACK_GATE_TIMEOUT=120
|
||||
export ENABLED_SERVICES=rally
|
||||
|
||||
function pre_test_hook {
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
}
|
||||
export -f pre_test_hook
|
||||
# TODO(mrostecki): Remove this if statement after implementing
|
||||
# Devstack plugin in Rally.
|
||||
if [ -d $BASE/new/rally/devstack ]; then
|
||||
# New-style Devstack integration
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||
else
|
||||
# Old-style Devstack integration
|
||||
export ENABLED_SERVICES=rally,
|
||||
|
||||
function pre_test_hook {
|
||||
# Install rally-devstack integration
|
||||
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
|
||||
}
|
||||
export -f pre_test_hook
|
||||
fi
|
||||
|
||||
function post_test_hook {
|
||||
$BASE/new/rally/tests/ci/rally-verify.sh
|
||||
|
|
|
|||
Loading…
Reference in New Issue