From 2eeea6011934c810fb69a3a5075f0ccbbf678a8e Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Wed, 13 Jan 2016 10:08:52 -0800 Subject: [PATCH] Fix ENABLED_SERVICES concat failure for stable branch jobs bc3a8eadd1cea099ef237ed498b11c0c65f34b79 removes the n-obj service from jobs in master but keeps in the stable branch jobs. However, several of the job definitions were not concatenating it correctly on the stable branch definition so some services were not starting, like n-net, which leads to very bad things on stable branch jobs. Change-Id: I9f842b438f313691046afa5614203e1600c76b92 Closes-Bug: #1533777 --- jenkins/jobs/devstack-gate.yaml | 10 +++++----- jenkins/jobs/heat.yaml | 4 ++-- jenkins/jobs/networking-ovn.yaml | 2 +- jenkins/jobs/nodepool.yaml | 4 ++-- jenkins/jobs/rally.yaml | 2 +- jenkins/jobs/sahara.yaml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 6523386de9..934e02ed62 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -292,7 +292,7 @@ ENABLED_SERVICES=n-api,n-crt,n-cpu,n-sch,n-cond,g-api,g-reg,key,n-net # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - ENABLED_SERVICES+=n-obj, + ENABLED_SERVICES+=,n-obj, fi export ENABLED_SERVICES @@ -1168,7 +1168,7 @@ ENABLED_SERVICES=n-api,n-crt,n-cpu,n-sch,n-cond,g-api,g-reg,key,n-net # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - ENABLED_SERVICES+=n-obj, + ENABLED_SERVICES+=,n-obj, fi export ENABLED_SERVICES export DEVSTACK_GATE_TEMPEST_LARGE_OPS=100 @@ -1206,7 +1206,7 @@ ENABLED_SERVICES=n-api,n-crt,n-cpu,n-sch,n-cond,g-api,g-reg,key,n-net # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - ENABLED_SERVICES+=n-obj, + ENABLED_SERVICES+=,n-obj, fi export ENABLED_SERVICES export DEVSTACK_GATE_TEMPEST_LARGE_OPS=100 @@ -1245,7 +1245,7 @@ ENABLED_SERVICES=n-api,n-crt,n-cpu,n-sch,n-cond,g-api,g-reg,key # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - ENABLED_SERVICES+=n-obj, + ENABLED_SERVICES+=,n-obj, fi export ENABLED_SERVICES export DEVSTACK_GATE_TEMPEST_LARGE_OPS=100 @@ -1285,7 +1285,7 @@ ENABLED_SERVICES=n-api,n-crt,n-cpu,n-sch,n-cond,g-api,g-reg,key # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - ENABLED_SERVICES+=n-obj, + ENABLED_SERVICES+=,n-obj, fi export ENABLED_SERVICES export DEVSTACK_GATE_TEMPEST_LARGE_OPS=100 diff --git a/jenkins/jobs/heat.yaml b/jenkins/jobs/heat.yaml index 3940401843..6b718e414c 100644 --- a/jenkins/jobs/heat.yaml +++ b/jenkins/jobs/heat.yaml @@ -73,7 +73,7 @@ services=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,q-vpn,rabbit,s-account,s-container,s-object,s-proxy,q-lbaas,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-anotification # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - services+=n-obj, + services+=,n-obj, fi export HEAT_BUILD_PIP_MIRROR=True export DEVSTACK_GATE_TIMEOUT=70 @@ -218,7 +218,7 @@ OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,q-vpn,rabbit,s-account,s-container,s-object,s-proxy,q-lbaas,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - OVERRIDE_ENABLED_SERVICES+=n-obj, + OVERRIDE_ENABLED_SERVICES+=,n-obj, fi export OVERRIDE_ENABLED_SERVICES diff --git a/jenkins/jobs/networking-ovn.yaml b/jenkins/jobs/networking-ovn.yaml index b6d0412a48..9c28dac961 100644 --- a/jenkins/jobs/networking-ovn.yaml +++ b/jenkins/jobs/networking-ovn.yaml @@ -90,7 +90,7 @@ export OVERRIDE_ENABLED_SERVICES=key,rally,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,g-api,g-reg,rabbit,tempest,mysql,dstat,ovn-northd,ovn-controller,q-svc,q-dhcp,q-l3 # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - OVERRIDE_ENABLED_SERVICES+=n-obj, + OVERRIDE_ENABLED_SERVICES+=,n-obj, fi export OVERRIDE_ENABLED_SERVICES diff --git a/jenkins/jobs/nodepool.yaml b/jenkins/jobs/nodepool.yaml index 2278f8b347..cc8ec92858 100644 --- a/jenkins/jobs/nodepool.yaml +++ b/jenkins/jobs/nodepool.yaml @@ -27,7 +27,7 @@ OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-lbaas,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - OVERRIDE_ENABLED_SERVICES+=n-obj, + OVERRIDE_ENABLED_SERVICES+=,n-obj, fi export OVERRIDE_ENABLED_SERVICES export BRANCH_OVERRIDE={branch-override} @@ -84,7 +84,7 @@ OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-lbaas,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - OVERRIDE_ENABLED_SERVICES+=n-obj, + OVERRIDE_ENABLED_SERVICES+=,n-obj, fi export OVERRIDE_ENABLED_SERVICES export BRANCH_OVERRIDE={branch-override} diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml index 546b688448..a17a64afdf 100644 --- a/jenkins/jobs/rally.yaml +++ b/jenkins/jobs/rally.yaml @@ -759,7 +759,7 @@ services=key,mysql,rabbit,n-api,n-cond,n-cpu,n-crt,n-sch,g-api,g-reg,q-agt,q-dhcp,q-l3,q-lbaas,q-meta,q-svc # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - services+=n-obj, + services+=,n-obj, fi export OVERRIDE_ENABLED_SERVICES=$services export PROJECTS="openstack/rally $PROJECTS" diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml index 283d4751db..edcff1334a 100644 --- a/jenkins/jobs/sahara.yaml +++ b/jenkins/jobs/sahara.yaml @@ -229,7 +229,7 @@ OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,q-vpn,rabbit,s-account,s-container,s-object,s-proxy,q-lbaas,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,sahara # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - OVERRIDE_ENABLED_SERVICES+=n-obj, + OVERRIDE_ENABLED_SERVICES+=,n-obj, fi export OVERRIDE_ENABLED_SERVICES export DEVSTACK_GATE_TIMEOUT=120