From 65514e4fe3b8e343acd6c4b569dce3e230b72d54 Mon Sep 17 00:00:00 2001
From: Thomas Herve <therve@redhat.com>
Date: Tue, 22 Nov 2016 15:41:00 +0100
Subject: [PATCH] Add a amqp1 job for Heat

This adds a non-voting job for Heat integration tests using amqp1
oslo.messaging plugin, only on master for now.

Change-Id: I42c51524f64368325a132f79706fe305b8f701fa
---
 jenkins/jobs/heat.yaml     | 8 +++++++-
 jenkins/jobs/projects.yaml | 9 +++++++++
 zuul/layout.yaml           | 5 +++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/jenkins/jobs/heat.yaml b/jenkins/jobs/heat.yaml
index aa2cfa8320..cded805395 100644
--- a/jenkins/jobs/heat.yaml
+++ b/jenkins/jobs/heat.yaml
@@ -103,7 +103,13 @@
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
           if [ "{special}" == "-identity-v3-only" ] ; then
-              export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
+          fi
+          if [ "{special}" == "-amqp1" ] ; then
+              export PROJECTS="openstack/oslo.messaging $PROJECTS"
+              export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS"
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1"
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=oslo.messaging"
           fi
           function pre_test_hook {{
               cd /opt/stack/new/heat/heat_integrationtests
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 9e1ec8c657..718f54bac1 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -5299,6 +5299,15 @@
           branch-override: default
           engine: orig
           lbaasversion: lbaasv1
+      - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}-{node}{special}{job-suffix}':
+          datastore: mysql
+          pipeline: gate
+          node: 'centos-7'
+          special: '-amqp1'
+          job-suffix: '-nv'
+          branch-override: default
+          engine: convg
+          lbaasversion: lbaasv2
       - '{pipeline}-tempest-dsvm-heat{special}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 6b506640e7..223d2c3e03 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1905,6 +1905,10 @@ jobs:
   - name: ^gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-xenial$
     branch: ^(?!stable/(liberty|mitaka)).*$
 
+  # NOTE(therve) (heat) run amqp1 ocata and forward
+  - name: ^gate-heat-dsvm-functional-convg-mysql-lbaasv2-centos-7-amqp1-nv$
+    branch: ^(?!stable/(liberty|mitaka|newton)).*$
+
   - name: gate-tempest-dsvm-heat
     branch: ^(stable/liberty).*$
 
@@ -10200,6 +10204,7 @@ projects:
       - gate-heat-dsvm-functional-orig-mysql-lbaasv2-ubuntu-xenial
       - gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-trusty
       - gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-xenial
+      - gate-heat-dsvm-functional-convg-mysql-lbaasv2-centos-7-amqp1-nv
       - gate-tempest-dsvm-heat
       - gate-tempest-dsvm-heat-apache-ubuntu-trusty
       - gate-tempest-dsvm-heat-apache-ubuntu-xenial