From 79433b516ed92793e19a593ebd0eddb03fa27aab Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Thu, 16 Mar 2017 19:59:54 +0100
Subject: [PATCH] Use local_conf for almanach and aodh

Convert almanach and aodh devstack jobs to use the new local_conf set
up.

Change-Id: I52103a3ffaa1e40aaa829388ccbf0552fed46995
---
 jenkins/jobs/almanach.yaml |  5 ++++-
 jenkins/jobs/aodh.yaml     | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/jenkins/jobs/almanach.yaml b/jenkins/jobs/almanach.yaml
index 11c6e0674c..75d311d085 100644
--- a/jenkins/jobs/almanach.yaml
+++ b/jenkins/jobs/almanach.yaml
@@ -11,6 +11,10 @@
       - link-logs
       - net-info
       - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            enable_plugin almanach git://git.openstack.org/openstack/almanach
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
@@ -18,7 +22,6 @@
           export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
           export DEVSTACK_GATE_TEMPEST_REGEX="^almanach\."
           export PROJECTS="openstack/almanach $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin almanach git://git.openstack.org/openstack/almanach"
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
diff --git a/jenkins/jobs/aodh.yaml b/jenkins/jobs/aodh.yaml
index 154a69550d..40a5d3b681 100644
--- a/jenkins/jobs/aodh.yaml
+++ b/jenkins/jobs/aodh.yaml
@@ -11,11 +11,14 @@
       - link-logs
       - net-info
       - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            enable_plugin aodh git://git.openstack.org/openstack/aodh
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export PROJECTS="openstack/aodh $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin aodh git://git.openstack.org/openstack/aodh"
 
           function gate_hook {{
               cd /opt/stack/new/aodh/devstack/gate
@@ -50,6 +53,10 @@
       - link-logs
       - net-info
       - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            enable_plugin aodh git://git.openstack.org/openstack/aodh
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
@@ -58,7 +65,6 @@
           export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
           export PROJECTS="openstack/aodh $PROJECTS"
           export AODH_BACKEND={backend}
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin aodh git://git.openstack.org/openstack/aodh"
           if [ "{backend}" = "postgresql" ] ; then
               export DEVSTACK_GATE_POSTGRES=1
           fi