From f34470d1a38a9f66b9c3fed99d738dc2aba52c0e Mon Sep 17 00:00:00 2001
From: Liping Mao <limao@cisco.com>
Date: Sat, 8 Oct 2016 16:28:28 +0800
Subject: [PATCH] Add CI Job to check kuryr-libnetwork work with latest
 kuryr_lib src code

These CI jobs only need run on kuryr-libnetwork master branch, do not
need to check if kuryr-libnetwork stable branch can work with kuryr_lib
master code.

Change-Id: I3d8c08f4703188042e1bf4b21de10a96a200aa50
Partially-implements: bp cross-project-ci
---
 jenkins/jobs/kuryr.yaml    | 10 ++++++++--
 jenkins/jobs/projects.yaml | 18 ++++++++++++++++--
 zuul/layout.yaml           | 14 ++++++++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/jenkins/jobs/kuryr.yaml b/jenkins/jobs/kuryr.yaml
index 3f9176a4ab..5a16915aa5 100644
--- a/jenkins/jobs/kuryr.yaml
+++ b/jenkins/jobs/kuryr.yaml
@@ -38,7 +38,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-kuryr-libnetwork-dsvm-fullstack{job-suffix}'
+    name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -67,6 +67,9 @@
 
           export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork"
+          if [ "{kuryr_lib-src}" == "-kuryr_lib-src" ] ; then
+              export DEVSTACK_PROJECT_FROM_GIT="kuryr"
+          fi
 
           function gate_hook {{
               bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/gate_hook.sh fullstack
@@ -87,7 +90,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-kuryr-libnetwork-dsvm-rally{job-suffix}'
+    name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -113,6 +116,9 @@
 
           export DEVSTACK_LOCAL_CONFIG="enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
+          if [ "{kuryr_lib-src}" == "-kuryr_lib-src" ] ; then
+              export DEVSTACK_PROJECT_FROM_GIT="kuryr"
+          fi
 
           export OVERRIDE_ENABLED_SERVICES=kuryr-libnetwork,etcd-server,docker-engine,q-svc,q-dhcp,q-agt,q-l3,key,mysql,rabbit
 
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 6d07f0e859..6451154a99 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -6264,14 +6264,28 @@
           node: ubuntu-trusty
           job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-kuryr-libnetwork-dsvm-fullstack{job-suffix}':
+      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
+          kuryr_lib-src: ''
           job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-kuryr-libnetwork-dsvm-rally{job-suffix}':
+      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack{job-suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          kuryr_lib-src: '-kuryr_lib-src'
+          job-suffix: '-nv'
+          branch-override: default
+      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
+          kuryr_lib-src: ''
+          job-suffix: '-nv'
+          branch-override: default
+      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally{job-suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          kuryr_lib-src: '-kuryr_lib-src'
           job-suffix: '-nv'
           branch-override: default
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index dddc9b95a4..5cd4486e7c 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2752,6 +2752,18 @@ jobs:
   - name: ^kuryr-libnetwork-coverage-ubuntu-(trusty|xenial)
     voting: false
 
+  # NOTE(limao): Only run these jobs on kuryr-libnetwork master branch,
+  # because we do not need to check if kuryr-libnetwork  stable branch
+  # can work with kuryr_lib master.
+  - name: gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-nv
+    branch: master
+
+  # NOTE(limao): Only run these jobs on kuryr-libnetwork master branch,
+  # because we do not need to check if kuryr-libnetwork  stable branch
+  # can work with kuryr_lib master.
+  - name: gate-kuryr-libnetwork-kuryr_lib-src-dsvm-rally-nv
+    branch: master
+
   - name: gate-solum-infra-guestagent-python34
     voting: false
 
@@ -10604,7 +10616,9 @@ projects:
       - kuryr-libnetwork-coverage-ubuntu-trusty
       - kuryr-libnetwork-coverage-ubuntu-xenial
       - gate-install-dsvm-kuryr-libnetwork-nv
+      - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-nv
       - gate-kuryr-libnetwork-dsvm-fullstack-nv
+      - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-rally-nv
       - gate-kuryr-libnetwork-dsvm-rally-nv
 
   - name: openstack/kwapi