openstack/project-config
Code Issues Proposed changes

Remove typos in murano-* and rally-murano jobs definitions

Browse Source 
Murano plugin should be enabled only for liberty and upper branches.
Enabling plugin in any case make murano gates in kilo branch to mailfunction.
This patch removes extra lines with enable-plugin functions.

Change-Id: I23dd8a75f968fbef773b4265a5e6941a70dda280
This commit is contained in:
Victor Ryzhenkin 2015-10-26 21:16:04 +03:00
parent d68450c61b
commit 8f0bd5535a
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins/jobs/murano.yaml
View File

@ -20,7 +20,6 @@
export PROJECTS="openstack/murano $PROJECTS" export PROJECTS="openstack/murano $PROJECTS"
export PROJECTS="openstack/murano-dashboard $PROJECTS" export PROJECTS="openstack/murano-dashboard $PROJECTS"
export PROJECTS="openstack/python-muranoclient $PROJECTS" export PROJECTS="openstack/python-muranoclient $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin murano git://git.openstack.org/openstack/murano"
export KEEP_LOCALRC=1 export KEEP_LOCALRC=1
if [[ $ZUUL_BRANCH =~ "kilo" ]]; then if [[ $ZUUL_BRANCH =~ "kilo" ]]; then
@ -85,7 +84,6 @@
export KEEP_LOCALRC=1 export KEEP_LOCALRC=1
export DEVSTACK_LOCAL_CONFIG="enable_plugin mistral git://git.openstack.org/openstack/mistral" export DEVSTACK_LOCAL_CONFIG="enable_plugin mistral git://git.openstack.org/openstack/mistral"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin murano git://git.openstack.org/openstack/murano"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT=True"
if [[ $ZUUL_BRANCH =~ "kilo" ]]; then if [[ $ZUUL_BRANCH =~ "kilo" ]]; then
@ -146,7 +144,6 @@
export PROJECTS="openstack/murano $PROJECTS" export PROJECTS="openstack/murano $PROJECTS"
export PROJECTS="openstack/murano-dashboard $PROJECTS" export PROJECTS="openstack/murano-dashboard $PROJECTS"
export PROJECTS="openstack/python-muranoclient $PROJECTS" export PROJECTS="openstack/python-muranoclient $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin murano git://git.openstack.org/openstack/murano"
export KEEP_LOCALRC=1 export KEEP_LOCALRC=1
if [[ $ZUUL_BRANCH =~ "kilo" ]]; then if [[ $ZUUL_BRANCH =~ "kilo" ]]; then
@ -158,7 +155,7 @@
else else
# Enable murano devstack plugin. Provided repo should be cloned by zuul before devstack run # Enable murano devstack plugin. Provided repo should be cloned by zuul before devstack run
# and below provided link should not be used. # and below provided link should not be used.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin murano git://git.openstack.org/openstack/murano" export DEVSTACK_LOCAL_CONFIG="enable_plugin murano git://git.openstack.org/openstack/murano"
fi fi
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then

1
jenkins/jobs/rally.yaml
View File

@ -238,7 +238,6 @@
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,
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally" export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin murano git://git.openstack.org/openstack/murano"
if [[ $ZUUL_BRANCH =~ "kilo" ]]; then if [[ $ZUUL_BRANCH =~ "kilo" ]]; then
# Kilo version uses 'hooks' approach that requires explicit # Kilo version uses 'hooks' approach that requires explicit