From 585dca13deeaa84ce829c607b4e4e8f1cf17d48b Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Mon, 29 Jun 2015 17:40:22 +0200
Subject: [PATCH] Add periodic Kilo jobs

New in Kilo is Ironic and neutron-*aas.

Add periodic tempest jobs even when they run as compat jobs
on each tempest master check for stable-maint visiblity.

Change-Id: Id2fe065cf5019cd4ebf5ad62aedc1395e0c14d6b
---
 jenkins/jobs/projects.yaml           | 20 ++++++++++++++++++++
 jenkins/jobs/python-bitrot-jobs.yaml | 10 ++++++++++
 zuul/layout.yaml                     | 23 +++++++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index c1292163ca..3ef91005fa 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -45,6 +45,7 @@
     jobs:
       - python-jobs
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
       - rally-jobs
@@ -98,6 +99,7 @@
     jobs:
       - python-jobs
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - gate-{name}-pylint
       - translation-jobs
@@ -195,6 +197,7 @@
     jobs:
       - python-jobs
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
       - rally-jobs
@@ -292,6 +295,7 @@
           branch-designator: ''
           branch-override: default
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
       - rally-jobs
@@ -323,6 +327,7 @@
     jobs:
       - python-jobs
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - gate-{name}-selenium
       - javascript-jobs
@@ -337,6 +342,7 @@
       - python-jobs
       - openstack-publish-jobs
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - translation-jobs
       - '{pipeline}-ironic-dsvm-functional{branch-designator}':
           pipeline: check
@@ -458,6 +464,7 @@
     jobs:
       - python-jobs
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
       - rally-jobs
@@ -674,6 +681,7 @@
     jobs:
       - python-jobs
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - rally-jobs
       - translation-jobs
@@ -731,6 +739,7 @@
 
     jobs:
       - python-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - '{pipeline}-neutron-fwaas-dsvm-functional{branch-designator}':
           pipeline: gate
@@ -751,6 +760,7 @@
 
     jobs:
       - python-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - '{pipeline}-neutron-{lbaasversion}-dsvm-api{branch-designator}':
           pipeline: check
@@ -792,6 +802,7 @@
 
     jobs:
       - python-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - '{pipeline}-neutron-vpnaas-dsvm-functional{branch-designator}':
           pipeline: gate
@@ -823,6 +834,7 @@
     jobs:
       - python-jobs
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - gate-{name}-pylint
       - gate-{name}-pip-missing-reqs
@@ -877,6 +889,7 @@
     jobs:
       - python-jobs
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - gate-{name}-pylint
       - hook-{name}-rtfd
       - pypi-jobs
@@ -958,6 +971,7 @@
     jobs:
       - python-jobs
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
       - openstack-doc-jobs
@@ -1524,6 +1538,7 @@
     jobs:
       - python-jobs
       - python-juno-bitrot-jobs
+      - python-kilo-bitrot-jobs
       - openstack-publish-jobs
 
 - project:
@@ -2900,6 +2915,11 @@
           node: 'devstack-precise || devstack-trusty'
           branch-designator: '-juno'
           branch-override: stable/juno
+      - devstack-jobs:
+          pipeline: periodic
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: '-kilo'
+          branch-override: stable/kilo
       - devstack-jobs:
           pipeline: periodic
           node: 'devstack-precise || devstack-trusty'
diff --git a/jenkins/jobs/python-bitrot-jobs.yaml b/jenkins/jobs/python-bitrot-jobs.yaml
index ed58941289..be06edf3e0 100644
--- a/jenkins/jobs/python-bitrot-jobs.yaml
+++ b/jenkins/jobs/python-bitrot-jobs.yaml
@@ -77,3 +77,13 @@
       - 'periodic-{name}-python26{branch-name}'
       - 'periodic-{name}-python27{branch-name}'
       - 'periodic-{name}-docs{branch-name}'
+
+
+- job-group:
+    name: python-kilo-bitrot-jobs
+    branch: 'stable/kilo'
+    branch-name: '-kilo'
+    node: 'bare-precise || bare-trusty'
+    jobs:
+      - 'periodic-{name}-python27{branch-name}'
+      - 'periodic-{name}-docs{branch-name}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 441a4c758e..f2e51ca188 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -348,6 +348,11 @@ project-templates:
       - 'periodic-{name}-python26-juno'
       - 'periodic-{name}-python27-juno'
 
+  - name: periodic-kilo
+    periodic-stable:
+      - 'periodic-{name}-docs-kilo'
+      - 'periodic-{name}-python27-kilo'
+
   - name: openstack-doc-gate
     check:
       - gate-{name}-tox-checklinks
@@ -1543,6 +1548,7 @@ projects:
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: periodic-juno
+      - name: periodic-kilo
       - name: check-requirements
       - name: integrated-gate
       - name: grenade
@@ -1589,6 +1595,7 @@ projects:
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: periodic-juno
+      - name: periodic-kilo
       - name: check-requirements
       - name: integrated-gate
       - name: grenade
@@ -1715,6 +1722,7 @@ projects:
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: periodic-juno
+      - name: periodic-kilo
       - name: check-requirements
       - name: integrated-gate
       - name: grenade
@@ -1782,6 +1790,7 @@ projects:
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: periodic-juno
+      - name: periodic-kilo
       - name: check-requirements
       - name: translation-jobs
       - name: experimental-tripleo-jobs
@@ -1830,6 +1839,7 @@ projects:
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: periodic-juno
+      - name: periodic-kilo
       - name: check-requirements
       - name: translation-jobs
       - name: experimental-tripleo-jobs
@@ -1863,6 +1873,7 @@ projects:
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: periodic-juno
+      - name: periodic-kilo
       - name: check-requirements
       - name: translation-jobs
     check:
@@ -1938,6 +1949,7 @@ projects:
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: periodic-juno
+      - name: periodic-kilo
       - name: check-requirements
       - name: integrated-gate
       - name: grenade
@@ -2206,6 +2218,7 @@ projects:
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: periodic-juno
+      - name: periodic-kilo
       - name: check-requirements
       - name: integrated-gate-neutron
       - name: translation-jobs
@@ -2241,6 +2254,7 @@ projects:
       - name: check-requirements
       - name: integrated-gate-neutron
       - name: merge-check
+      - name: periodic-kilo
       - name: python-jobs
       - name: openstack-server-release-jobs
     post:
@@ -2252,6 +2266,7 @@ projects:
     template:
       - name: check-requirements
       - name: merge-check
+      - name: periodic-kilo
       - name: python-jobs
       - name: openstack-server-release-jobs
     check:
@@ -2276,6 +2291,7 @@ projects:
       - name: check-requirements
       - name: integrated-gate-neutron
       - name: merge-check
+      - name: periodic-kilo
       - name: python-jobs
       - name: openstack-server-release-jobs
     check:
@@ -2296,6 +2312,7 @@ projects:
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: periodic-juno
+      - name: periodic-kilo
       - name: check-requirements
       - name: integrated-gate
       - name: grenade
@@ -2376,6 +2393,7 @@ projects:
       - name: python-jobs
       - name: python3-jobs
       - name: periodic-juno
+      - name: periodic-kilo
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: check-requirements
@@ -2449,6 +2467,7 @@ projects:
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: periodic-juno
+      - name: periodic-kilo
       - name: check-requirements
       - name: translation-jobs
     check:
@@ -3028,6 +3047,7 @@ projects:
       - name: openstack-server-publish-jobs
       - name: check-requirements
       - name: periodic-juno
+      - name: periodic-kilo
     post:
       - oslo-incubator-coverage
 
@@ -4291,6 +4311,9 @@ projects:
       - periodic-tempest-dsvm-full-juno
       - periodic-tempest-dsvm-neutron-full-juno
       - periodic-tempest-dsvm-postgres-full-juno
+      - periodic-tempest-dsvm-full-kilo
+      - periodic-tempest-dsvm-neutron-full-kilo
+      - periodic-tempest-dsvm-postgres-full-kilo
     periodic-qa:
       - periodic-tempest-dsvm-full-non-isolated-master
       - periodic-tempest-dsvm-neutron-full-non-isolated-master