Switch Rally gates to new DevStack plugin style
After this patch was merged: https://review.openstack.org/#/c/190601/ Rally gates become broken. The check in jenkis/jobs/rally.yaml that should switch to new plugin style doesn't work (it contains bug). At this moment we are installing 2 versions of Rally (with new and old way) one is master another one is master + patch. As a result Rally gates are testing Rally master instead of proposed patch to Rally. This patch removes check of new/old style and use always new plugin style Change-Id: Id17c1422e4b1ff350e16f76b6fcaa1ce3aa6f6b4
This commit is contained in:
Boris Pavlovic
parent
51376227e4
commit
5912bd4e6d
@ -76,22 +76,8 @@
|
|||||||
ENABLED_SERVICES+=ironic,ir-api,ir-cond,
|
ENABLED_SERVICES+=ironic,ir-api,ir-cond,
|
||||||
fi
|
fi
|
||||||
export ENABLED_SERVICES
|
export ENABLED_SERVICES
|
||||||
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||||
|
|
||||||
# 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 {{
|
function post_test_hook {{
|
||||||
$BASE/new/rally/tests/ci/rally-gate.sh
|
$BASE/new/rally/tests/ci/rally-gate.sh
|
||||||
}}
|
}}
|
||||||
@ -126,30 +112,13 @@
|
|||||||
ENABLED_SERVICES+=designate,designate-api,designate-central,designate-sink,designate-mdns,
|
ENABLED_SERVICES+=designate,designate-api,designate-central,designate-sink,designate-mdns,
|
||||||
|
|
||||||
export ENABLED_SERVICES
|
export ENABLED_SERVICES
|
||||||
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||||
|
|
||||||
# TODO(mrostecki): Remove this if statement after implementing
|
function pre_test_hook {{
|
||||||
# Devstack plugin in Rally.
|
# Install designate-devstack integration
|
||||||
if [ -d $BASE/new/rally/devstack ]; then
|
cd /opt/stack/new/designate/contrib/devstack
|
||||||
# New-style Devstack integration
|
./pre_test_hook.sh
|
||||||
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
|
export -f pre_test_hook
|
||||||
|
|
||||||
function post_test_hook {{
|
function post_test_hook {{
|
||||||
@ -179,27 +148,13 @@
|
|||||||
# Keep localrc to be able to set some vars in pre_test_hook
|
# Keep localrc to be able to set some vars in pre_test_hook
|
||||||
export KEEP_LOCALRC=1
|
export KEEP_LOCALRC=1
|
||||||
|
|
||||||
# TODO(mrostecki): Remove this if statement after implementing
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||||
# 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 {{
|
function pre_test_hook {{
|
||||||
# Install manila-devstack integration
|
# Install manila-devstack integration
|
||||||
# 'dhss' means 'drivers handle share servers'
|
# 'dhss' means 'drivers handle share servers'
|
||||||
source $BASE/new/manila/contrib/ci/pre_test_hook.sh {dhss}
|
source $BASE/new/manila/contrib/ci/pre_test_hook.sh {dhss}
|
||||||
}}
|
}}
|
||||||
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/
|
|
||||||
# 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
|
export -f pre_test_hook
|
||||||
|
|
||||||
function post_test_hook {{
|
function post_test_hook {{
|
||||||
@ -272,30 +227,13 @@
|
|||||||
ENABLED_SERVICES=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,
|
ENABLED_SERVICES+=murano,murano-api,murano-engine,
|
||||||
export ENABLED_SERVICES
|
export ENABLED_SERVICES
|
||||||
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||||
|
|
||||||
# TODO(mrostecki): Remove this if statement after implementing
|
function pre_test_hook {{
|
||||||
# Devstack plugin in Rally.
|
# Install murano-devstack integration
|
||||||
if [ -d $BASE/new/rally/devstack ]; then
|
cd /opt/stack/new/murano/functionaltests
|
||||||
# New-style Devstack integration
|
./pre_test_hook.sh
|
||||||
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
|
export -f pre_test_hook
|
||||||
|
|
||||||
function post_test_hook {{
|
function post_test_hook {{
|
||||||
@ -326,30 +264,13 @@
|
|||||||
export RALLY_SCENARIO={scenario}
|
export RALLY_SCENARIO={scenario}
|
||||||
|
|
||||||
export ENABLED_SERVICES=mistral,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,
|
||||||
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||||
|
|
||||||
# TODO(mrostecki): Remove this if statement after implementing
|
function pre_test_hook {{
|
||||||
# Devstack plugin in Rally.
|
# Install mistral-devstack integration
|
||||||
if [ -d $BASE/new/rally/devstack ]; then
|
cd /opt/stack/new/mistral/functionaltests
|
||||||
# New-style Devstack integration
|
./pre_test_hook.sh
|
||||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
}}
|
||||||
|
|
||||||
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
|
export -f pre_test_hook
|
||||||
|
|
||||||
function post_test_hook {{
|
function post_test_hook {{
|
||||||
@ -650,22 +571,7 @@
|
|||||||
- shell: |
|
- shell: |
|
||||||
#/bin/bash -xe
|
#/bin/bash -xe
|
||||||
export PROJECTS="openstack/rally $PROJECTS"
|
export PROJECTS="openstack/rally $PROJECTS"
|
||||||
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||||
# 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 {
|
function post_test_hook {
|
||||||
cd $BASE/new/rally
|
cd $BASE/new/rally
|
||||||
@ -711,22 +617,7 @@
|
|||||||
export PROJECTS="openstack/rally $PROJECTS"
|
export PROJECTS="openstack/rally $PROJECTS"
|
||||||
export DEVSTACK_GATE_EXERCISES=0
|
export DEVSTACK_GATE_EXERCISES=0
|
||||||
export DEVSTACK_GATE_TIMEOUT=120
|
export DEVSTACK_GATE_TIMEOUT=120
|
||||||
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||||
# 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 {
|
function post_test_hook {
|
||||||
$BASE/new/rally/tests/ci/rally-verify.sh
|
$BASE/new/rally/tests/ci/rally-verify.sh
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user