From 6b2887e64562e761ad9c03dc2e91dc041a77c9c3 Mon Sep 17 00:00:00 2001
From: Eli Qiao <liyong.qiao@intel.com>
Date: Mon, 28 Dec 2015 14:14:44 +0800
Subject: [PATCH] Magnum: Add new job to do mesos functional testing

Adds gate_hook to magnum jobs.
Adds new pipe line to do mesos functional testing, set it to non-voting
first.

Implements: blueprint mesos-functional-testing
Depend-On: I8ee53de4d34aa79d037901e599fc6409a7de2e72
Change-Id: I9574c349e5f7a4f3fa3f8c4fdf53328fe35e0dee
---
 jenkins/jobs/magnum.yaml   | 6 ++++++
 jenkins/jobs/projects.yaml | 6 ++++++
 zuul/layout.yaml           | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/jenkins/jobs/magnum.yaml b/jenkins/jobs/magnum.yaml
index 1deb3ee191..308a3b6413 100644
--- a/jenkins/jobs/magnum.yaml
+++ b/jenkins/jobs/magnum.yaml
@@ -34,6 +34,12 @@
           # Keep localrc to be able to set some vars in post_test_hook
           export KEEP_LOCALRC=1
 
+          function gate_hook {{
+               cd /opt/stack/new/magnum/
+              ./magnum/tests/contrib/gate_hook.sh {coe}
+          }}
+          export -f gate_hook
+
           function post_test_hook {{
               source $BASE/new/devstack/accrc/admin/admin
               cd /opt/stack/new/magnum/
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index b3fd0f0a30..c7f2f6a24e 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2570,6 +2570,12 @@
           coe: 'swarm'
           job-suffix: ''
           branch-override: default
+      - '{pipeline}-functional-dsvm-magnum-{coe}{job-suffix}':
+          pipeline: gate
+          node: devstack-trusty
+          coe: 'mesos'
+          job-suffix: ''
+          branch-override: default
       - 'gate-{name}-tox-{envlist}':
           envlist: bandit
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e8c15a9de9..cc4e3c2fa3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1110,6 +1110,10 @@ jobs:
   - name: gate-functional-dsvm-magnum-swarm
     branch: ^(?!stable/kilo).*$
 
+  - name: gate-functional-dsvm-magnum-mesos
+    branch: ^(?!stable/(kilo|liberty)).*$
+    voting: false
+
   - name: gate-tempest-dsvm-centos7
     voting: false
 
@@ -5945,6 +5949,7 @@ projects:
       - gate-functional-dsvm-magnum-api
       - gate-functional-dsvm-magnum-k8s
       - gate-functional-dsvm-magnum-swarm
+      - gate-functional-dsvm-magnum-mesos
       - gate-magnum-tox-bandit
       - magnum-coverage