openstack
/
project-config
Code Issues Proposed changes

Fix broken ENABLED_SERVICES in neutron and scalpels jobs 

- Fix missing comma between n-sch and q-svc
- Use OVERRIDE_ENABLED_SERVICES instead, as it seems like the
  intention of the original change [1]

Note that this effectively remove the following from ENABLED_SERVICES:

    c-api
    c-bak
    c-sch
    c-vol
    ceilometer-acentral
    ceilometer-acompute
    ceilometer-alarm-evaluator
    ceilometer-alarm-notifier
    ceilometer-anotification
    ceilometer-api
    ceilometer-collector
    cinder
    dstat
    horizon
    q-fwaas
    q-lbaas
    q-metering
    quantum
    s-account
    s-container
    s-object
    s-proxy

[1] Iccba951301d2c09e01b6c1a15ed1e88c8e0db69e

Change-Id: I29e3e098bd972b88551db70e280aa86facbd8f42
This commit is contained in:
YAMAMOTO Takashi 2015-11-11 13:40:43 +09:00
parent 74088cbe82
commit 535406d412
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jenkins/jobs/neutron.yaml
View File

@ -59,12 +59,12 @@
- shell: |
#!/bin/bash -xe
# Start with the base set of services
ENABLED_SERVICES=mysql,rabbit,key,tempest,g-api,g-reg,
OVERRIDE_ENABLED_SERVICES=mysql,rabbit,key,tempest,g-api,g-reg
# Add Nova services (except for nova-network)
ENABLED_SERVICES+=n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
OVERRIDE_ENABLED_SERVICES+=,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
# Enable Neutron
ENABLED_SERVICES+=q-svc,q-dhcp,q-meta,q-l3,q-agt
export ENABLED_SERVICES
OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt
export OVERRIDE_ENABLED_SERVICES
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
@ -310,12 +310,12 @@
- shell: |
#!/bin/bash -xe
# Start with the base set of services
ENABLED_SERVICES=mysql,rabbit,key,tempest,g-api,g-reg,
OVERRIDE_ENABLED_SERVICES=mysql,rabbit,key,tempest,g-api,g-reg
# Add Nova services (except for nova-network)
ENABLED_SERVICES+=n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
OVERRIDE_ENABLED_SERVICES+=,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
# Enable Neutron
ENABLED_SERVICES+=q-svc,q-dhcp,q-meta,q-l3,q-agt
export ENABLED_SERVICES
OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt
export OVERRIDE_ENABLED_SERVICES
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1

8
jenkins/jobs/scalpels.yaml
View File

@ -14,12 +14,12 @@
- shell: |
#!/bin/bash -xe
# Start with the base set of services
ENABLED_SERVICES=mysql,rabbit,key,g-api,g-reg,
OVERRIDE_ENABLED_SERVICES=mysql,rabbit,key,g-api,g-reg
# Add Nova services (except for nova-network)
ENABLED_SERVICES+=n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
OVERRIDE_ENABLED_SERVICES+=,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
# Enable Neutron
ENABLED_SERVICES+=q-svc,q-dhcp,q-meta,q-l3,q-agt
export ENABLED_SERVICES
OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt
export OVERRIDE_ENABLED_SERVICES
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_NEUTRON=1