openstack
/
project-config
Code Issues Proposed changes

Remove Nova object store service 

As of I8bf7cbaa7015bb61656ab90ccc8f944aaeebb095, Nova
removed the n-obj service, so we should cleanup

Change-Id: I5e681c8c7031dd7f04ec9d77914c9da051a64822
This commit is contained in:
Davanum Srinivas 2016-01-12 06:40:46 -05:00
parent a8f84e62a4
commit bc3a8eadd1
8 changed files with 93 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/jobs/congress.yaml
View File

@ -15,7 +15,11 @@
#!/bin/bash -xe
ENABLED_SERVICES=tempest,
ENABLED_SERVICES+=key,g-api,g-reg,
ENABLED_SERVICES+=n-api,n-crt,n-obj,n-cpu,n-sch,n-cauth,
ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cauth,
# n-obj has been removed from mitaka
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
ENABLED_SERVICES+=n-obj,
fi
ENABLED_SERVICES+=horizon,mysql,rabbit,sysstat,
ENABLED_SERVICES+=cinder,c-api,c-vol,c-sch,n-cond,
ENABLED_SERVICES+=neutron,q-svc,q-agt,q-dhcp,q-l3,q-meta,

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

@ -289,7 +289,13 @@
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NO_SERVICES=1
export ENABLED_SERVICES=n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,n-net
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,
fi
export ENABLED_SERVICES
export DEVSTACK_GATE_TEMPEST_LARGE_OPS=100
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -1159,7 +1165,12 @@
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NO_SERVICES=1
export ENABLED_SERVICES=n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,n-net
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,
fi
export ENABLED_SERVICES
export DEVSTACK_GATE_TEMPEST_LARGE_OPS=100
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -1192,7 +1203,12 @@
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NO_SERVICES=1
export ENABLED_SERVICES=n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,n-net
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,
fi
export ENABLED_SERVICES
export DEVSTACK_GATE_TEMPEST_LARGE_OPS=100
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -1226,7 +1242,12 @@
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NO_SERVICES=1
export ENABLED_SERVICES=n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key
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,
fi
export ENABLED_SERVICES
export DEVSTACK_GATE_TEMPEST_LARGE_OPS=100
export DEVSTACK_GATE_NEUTRON=1
export BRANCH_OVERRIDE={branch-override}
@ -1261,7 +1282,12 @@
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NO_SERVICES=1
export ENABLED_SERVICES=n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key
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,
fi
export ENABLED_SERVICES
export DEVSTACK_GATE_TEMPEST_LARGE_OPS=100
export DEVSTACK_GATE_NEUTRON=1
export BRANCH_OVERRIDE={branch-override}

15
jenkins/jobs/heat.yaml
View File

@ -70,7 +70,11 @@
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
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-obj,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
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,
fi
export HEAT_BUILD_PIP_MIRROR=True
export DEVSTACK_GATE_TIMEOUT=70
export DEVSTACK_GATE_NEUTRON=1
@ -210,7 +214,14 @@
#!/bin/bash -xe
export PROJECTS="openstack-dev/grenade $PROJECTS"
export PYTHONUNBUFFERED=true
export 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-obj,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
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,
fi
export OVERRIDE_ENABLED_SERVICES
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=0

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

@ -87,7 +87,12 @@
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
export OVERRIDE_ENABLED_SERVICES=key,rally,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,g-api,g-reg,rabbit,tempest,mysql,dstat,ovn-northd,ovn-controller,q-svc,q-dhcp,q-l3
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,
fi
export OVERRIDE_ENABLED_SERVICES
function post_test_hook {{
$BASE/new/rally/tests/ci/rally-gate.sh

14
jenkins/jobs/nodepool.yaml
View File

@ -24,7 +24,12 @@
export DEVSTACK_GATE_REMOVE_STACK_SUDO=0
# Override so we get a bare minimum set of base compute services
# required to have nodepool function.
export OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-obj,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
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,
fi
export OVERRIDE_ENABLED_SERVICES
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -76,7 +81,12 @@
export DEVSTACK_GATE_REMOVE_STACK_SUDO=0
# Override so we get a bare minimum set of base compute services
# required to have nodepool function.
export OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-obj,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
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,
fi
export OVERRIDE_ENABLED_SERVICES
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

18
jenkins/jobs/rally.yaml
View File

@ -69,7 +69,11 @@
ENABLED_SERVICES+=cinder,c-api,c-vol,c-sch,c-bak,
ENABLED_SERVICES+=g-api,g-reg,
ENABLED_SERVICES+=heat,h-api,h-api-cfn,h-api-cw,h-eng,
ENABLED_SERVICES+=n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,
ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cond,
# n-obj has been removed from mitaka
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
ENABLED_SERVICES+=n-obj,
fi
ENABLED_SERVICES+=s-proxy,s-account,s-container,s-object,
ENABLED_SERVICES+=ceilometer-acompute,ceilometer-acentral,ceilometer-api,
ENABLED_SERVICES+=ceilometer-anotification,ceilometer-collector,
@ -692,7 +696,11 @@
ENABLED_SERVICES=key,horizon,
ENABLED_SERVICES+=cinder,c-api,c-vol,c-sch,c-bak,
ENABLED_SERVICES+=g-api,g-reg,
ENABLED_SERVICES+=n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,
ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cond,
# n-obj has been removed from mitaka
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
ENABLED_SERVICES+=n-obj,
fi
ENABLED_SERVICES+=s-proxy,s-account,s-container,s-object,
if [ $DEVSTACK_GATE_NEUTRON -ne 1 ]; then
ENABLED_SERVICES+=n-net,n-api-meta,
@ -748,7 +756,11 @@
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
services=key,mysql,rabbit,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch,g-api,g-reg,q-agt,q-dhcp,q-l3,q-lbaas,q-meta,q-svc
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,
fi
export OVERRIDE_ENABLED_SERVICES=$services
export PROJECTS="openstack/rally $PROJECTS"
export PROJECTS="openstack/monasca-api $PROJECTS"

7
jenkins/jobs/sahara.yaml
View File

@ -226,7 +226,12 @@
export PROJECTS="openstack-dev/grenade $PROJECTS"
export PROJECTS="openstack/python-saharaclient $PROJECTS"
export PYTHONUNBUFFERED=true
export 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-obj,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
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,
fi
export OVERRIDE_ENABLED_SERVICES
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=0

6
jenkins/jobs/watcher.yaml
View File

@ -15,7 +15,11 @@
#!/bin/bash -xe
ENABLED_SERVICES=tempest,
ENABLED_SERVICES+=key,g-api,g-reg,
ENABLED_SERVICES+=n-api,n-crt,n-obj,n-cpu,n-sch,n-cauth,
ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cauth,
# n-obj has been removed from mitaka
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
ENABLED_SERVICES+=n-obj,
fi
ENABLED_SERVICES+=horizon,mysql,rabbit,sysstat,
ENABLED_SERVICES+=cinder,c-api,c-vol,c-sch,n-cond,
ENABLED_SERVICES+=neutron,q-svc,q-agt,q-dhcp,q-l3,q-meta