diff --git a/jenkins/jobs/murano.yaml b/jenkins/jobs/murano.yaml index 92eedad7d9..ed64a19777 100644 --- a/jenkins/jobs/murano.yaml +++ b/jenkins/jobs/murano.yaml @@ -20,7 +20,6 @@ export PROJECTS="openstack/murano $PROJECTS" export PROJECTS="openstack/murano-dashboard $PROJECTS" export PROJECTS="openstack/python-muranoclient $PROJECTS" - export DEVSTACK_LOCAL_CONFIG="enable_plugin murano git://git.openstack.org/openstack/murano" export KEEP_LOCALRC=1 if [[ $ZUUL_BRANCH =~ "kilo" ]]; then @@ -85,7 +84,6 @@ export KEEP_LOCALRC=1 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" if [[ $ZUUL_BRANCH =~ "kilo" ]]; then @@ -146,7 +144,6 @@ export PROJECTS="openstack/murano $PROJECTS" export PROJECTS="openstack/murano-dashboard $PROJECTS" export PROJECTS="openstack/python-muranoclient $PROJECTS" - export DEVSTACK_LOCAL_CONFIG="enable_plugin murano git://git.openstack.org/openstack/murano" export KEEP_LOCALRC=1 if [[ $ZUUL_BRANCH =~ "kilo" ]]; then @@ -158,7 +155,7 @@ else # Enable murano devstack plugin. Provided repo should be cloned by zuul before devstack run # 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 if [ "$BRANCH_OVERRIDE" != "default" ] ; then diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml index cbc9c7dc19..e99513f36a 100644 --- a/jenkins/jobs/rally.yaml +++ b/jenkins/jobs/rally.yaml @@ -238,7 +238,6 @@ 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+=$'\n'"enable_plugin murano git://git.openstack.org/openstack/murano" if [[ $ZUUL_BRANCH =~ "kilo" ]]; then # Kilo version uses 'hooks' approach that requires explicit