openstack/project-config
Code Issues Proposed changes

Merge "Fix ENABLED_SERVICES concat failure for stable branch jobs"

Browse Source
This commit is contained in:
Jenkins 2016-01-13 19:39:57 +00:00 committed by Gerrit Code Review
commit a3dcb17a7c
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jenkins/jobs/devstack-gate.yaml
View File

@ -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

4
jenkins/jobs/heat.yaml
View File

@ -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

2
jenkins/jobs/networking-ovn.yaml
View File

@ -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

4
jenkins/jobs/nodepool.yaml
View File

@ -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}

2
jenkins/jobs/rally.yaml
View File

@ -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"

2
jenkins/jobs/sahara.yaml
View File

@ -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