From 772b5aca571f2e01647c424e1478c22751d852e7 Mon Sep 17 00:00:00 2001
From: Brian Haley <brian.haley@hpe.com>
Date: Wed, 2 Dec 2015 11:18:04 -0500
Subject: [PATCH] Remove OVERRIDE_ENABLED_SERVICES from neutron yaml files

This lets the devstack gate setup the service list properly.

Change-Id: I582e1a742babce9bcb96ada60f5bc72a5bb6513a
Closes-bug: #1521846
---
 jenkins/jobs/neutron.yaml  | 14 --------------
 jenkins/jobs/scalpels.yaml |  7 -------
 2 files changed, 21 deletions(-)

diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index 1cd418d0ec..ec07ef03f4 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -62,13 +62,6 @@
       - devstack-checkout
       - shell: |
           #!/bin/bash -xe
-          # Start with the base set of services
-          OVERRIDE_ENABLED_SERVICES=mysql,rabbit,key,tempest,g-api,g-reg
-          # Add Nova services (except for nova-network)
-          OVERRIDE_ENABLED_SERVICES+=,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
-          # Enable Neutron
-          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
@@ -325,13 +318,6 @@
       - devstack-checkout
       - shell: |
           #!/bin/bash -xe
-          # Start with the base set of services
-          OVERRIDE_ENABLED_SERVICES=mysql,rabbit,key,tempest,g-api,g-reg
-          # Add Nova services (except for nova-network)
-          OVERRIDE_ENABLED_SERVICES+=,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
-          # Enable Neutron
-          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
diff --git a/jenkins/jobs/scalpels.yaml b/jenkins/jobs/scalpels.yaml
index 7cd9f1a410..a9fd7c4b4b 100644
--- a/jenkins/jobs/scalpels.yaml
+++ b/jenkins/jobs/scalpels.yaml
@@ -13,13 +13,6 @@
       - devstack-checkout
       - shell: |
           #!/bin/bash -xe
-          # Start with the base set of services
-          OVERRIDE_ENABLED_SERVICES=mysql,rabbit,key,g-api,g-reg
-          # Add Nova services (except for nova-network)
-          OVERRIDE_ENABLED_SERVICES+=,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
-          # Enable Neutron
-          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