Add stable/havana jobs.

This commit adds stable/havana jobs to JJB and Zuul. These are both periodic bitrot jobs and check jobs run against devstack-gate. As part of this process the stable jobs were pulled into a separate file so that they can be templated across branches. This should simplify the addition of IceHouse in the future. Change-Id: I46cab2220153f82ff89a1df0f083a99f9d5e6260
2013-11-15 15:54:56 -08:00 · 2013-11-15 15:54:56 -08:00 · 72f57a110d
commit 72f57a110d
parent e655a8b13e
6 changed files with 575 additions and 278 deletions
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-stable-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-stable-jobs.yaml
@ -0,0 +1,463 @@
+- job-template:
+    name: 'check-tempest-devstack-vm-full-stable-{release}'
+    node: devstack-precise || devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 90
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job-template:
+    name: 'check-tempest-devstack-vm-neutron-stable-{release}'
+    node: devstack-precise || devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_SMOKE_SERIAL=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job-template:
+    name: 'check-devstack-vm-cells-stable-{release}'
+    node: devstack-precise || devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_CELLS=1
+          export DEVSTACK_GATE_EXERCISES=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job-template:
+    name: 'check-tempest-devstack-vm-cells-stable-{release}'
+    node: devstack-precise || devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_CELLS=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job-template:
+    name: 'check-tempest-devstack-vm-cells-full-stable-{release}'
+    node: devstack-precise || devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 90
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export DEVSTACK_GATE_CELLS=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job-template:
+    name: 'check-tempest-devstack-vm-postgres-full-stable-{release}'
+    node: devstack-precise || devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 90
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export DEVSTACK_GATE_POSTGRES=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-full-stable-{release}'
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 90
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export ZUUL_BRANCH=stable/{release}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-stable-maint@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-postgres-full-stable-{release}'
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 90
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_POSTGRES=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export ZUUL_BRANCH=stable/{release}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-stable-maint@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-neutron-stable-{release}'
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 90
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_SMOKE_SERIAL=1
+          export ZUUL_BRANCH=stable/{release}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-stable-maint@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-all-stable-{release}'
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 180
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_ALL=1
+          export ZUUL_BRANCH=stable/{release}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-qa@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-coverage-stable-{release}'
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 180
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_COVERAGE=1
+          export ZUUL_BRANCH=stable/{release}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-qa@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-stress-stable-{release}'
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 180
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_STRESS=1
+          export ZUUL_BRANCH=stable/{release}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-qa@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-neutron-pg-stable-{release}'
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 120
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_POSTGRES=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_SMOKE_SERIAL=1
+          export ZUUL_BRANCH=stable/{release}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-qa@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-large-ops-stable-{release}'
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1
+          export ZUUL_BRANCH=stable/{release}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-qa@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-neutron-large-ops-stable-{release}'
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export ZUUL_BRANCH=stable/{release}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-qa@lists.openstack.org
+
+
+- job-group:
+    name: devstack-stable-check-jobs
+    jobs:
+      - 'check-tempest-devstack-vm-full-stable-{release}'
+      - 'check-tempest-devstack-vm-neutron-stable-{release}'
+      - 'check-devstack-vm-cells-stable-{release}'
+      - 'check-tempest-devstack-vm-cells-stable-{release}'
+      - 'check-tempest-devstack-vm-cells-full-stable-{release}'
+      - 'check-tempest-devstack-vm-postgres-full-stable-{release}'
+
+
+- job-group:
+    name: devstack-stable-periodic-jobs
+    jobs:
+      - 'periodic-tempest-devstack-vm-full-stable-{release}'
+      - 'periodic-tempest-devstack-vm-postgres-full-stable-{release}'
+      - 'periodic-tempest-devstack-vm-neutron-stable-{release}'
+      - 'periodic-tempest-devstack-vm-all-stable-{release}'
+      - 'periodic-tempest-devstack-vm-coverage-stable-{release}'
+      - 'periodic-tempest-devstack-vm-stress-stable-{release}'
+      - 'periodic-tempest-devstack-vm-neutron-pg-stable-{release}'
+      - 'periodic-tempest-devstack-vm-large-ops-stable-{release}'
+      - 'periodic-tempest-devstack-vm-neutron-large-ops-stable-{release}'
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@ -24,33 +24,6 @@
      - console-log


- job-template:
-    name: 'check-tempest-devstack-vm-full-stable-{release}'
-    node: devstack-precise || devstack-precise-check
-
-    wrappers:
-      - timeout:
-          timeout: 90
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
 - job:
    name: gate-tempest-devstack-vm-iad-trial
    node: devstack-precise-iad
@ -188,34 +161,6 @@
      - console-log


- job-template:
-    name: 'check-tempest-devstack-vm-neutron-stable-{release}'
-    node: devstack-precise || devstack-precise-check
-
-    wrappers:
-      - timeout:
-          timeout: 60
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_SMOKE_SERIAL=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
 - job-template:
    name: '{pipeline}-tempest-devstack-vm-neutron-pg'
    node: '{node}'
@ -355,33 +300,6 @@
      - console-log


- job-template:
-    name: 'check-devstack-vm-cells-stable-{release}'
-    node: devstack-precise || devstack-precise-check
-
-    wrappers:
-      - timeout:
-          timeout: 60
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_CELLS=1
-          export DEVSTACK_GATE_EXERCISES=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
 - job-template:
    name: '{pipeline}-tempest-devstack-vm-cells'
    node: '{node}'
@ -408,33 +326,6 @@
      - console-log


- job-template:
-    name: 'check-tempest-devstack-vm-cells-stable-{release}'
-    node: devstack-precise || devstack-precise-check
-
-    wrappers:
-      - timeout:
-          timeout: 60
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_CELLS=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
 - job-template:
    name: '{pipeline}-tempest-devstack-vm-cells-full'
    node: '{node}'
@ -461,32 +352,6 @@
      - devstack-logs
      - console-log

- job-template:
-    name: 'check-tempest-devstack-vm-cells-full-stable-{release}'
-    node: devstack-precise || devstack-precise-check
-
-    wrappers:
-      - timeout:
-          timeout: 90
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_CELLS=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log

 - job-template:
    name: '{pipeline}-tempest-devstack-vm-large-ops'
@ -540,98 +405,6 @@
      - console-log


- job:
-    name: periodic-tempest-devstack-vm-stable-grizzly
-    node: devstack-precise
-
-    wrappers:
-      - timeout:
-          timeout: 90
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export ZUUL_BRANCH=stable/grizzly
-          unset ZUUL_PROJECT
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-      - email:
-          recipients: openstack-stable-maint@lists.openstack.org
-
-
- job:
-    name: periodic-tempest-devstack-vm-postgres-stable-grizzly
-    node: devstack-precise
-
-    wrappers:
-      - timeout:
-          timeout: 90
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_POSTGRES=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export ZUUL_BRANCH=stable/grizzly
-          unset ZUUL_PROJECT
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-      - email:
-          recipients: openstack-stable-maint@lists.openstack.org
-
-
- job:
-    name: periodic-tempest-devstack-vm-neutron-stable-grizzly
-    node: devstack-precise
-
-    wrappers:
-      - timeout:
-          timeout: 90
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_SMOKE_SERIAL=1
-          export ZUUL_BRANCH=stable/grizzly
-          unset ZUUL_PROJECT
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-      - email:
-          recipients: openstack-stable-maint@lists.openstack.org
-
-
 - job:
    name: periodic-tempest-devstack-vm-all
    node: devstack-precise
@ -803,34 +576,6 @@
      - console-log


- job-template:
-    name: 'check-tempest-devstack-vm-postgres-full-stable-{release}'
-    node: devstack-precise || devstack-precise-check
-
-    wrappers:
-      - timeout:
-          timeout: 90
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_POSTGRES=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
 - job-template:
    name: '{pipeline}-grenade-devstack-vm'
    node: '{node}'
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@ -200,6 +200,7 @@
    jobs:
      - python-jobs
      - python-grizzly-bitrot-jobs
+      - python-havana-bitrot-jobs
      - openstack-publish-jobs
      - translation-jobs

@ -213,6 +214,7 @@
    jobs:
      - python-jobs
      - python-grizzly-bitrot-jobs
+      - python-havana-bitrot-jobs
      - openstack-publish-jobs
      - gate-{name}-pylint
      - translation-jobs
@ -392,6 +394,7 @@
    jobs:
      - python-jobs
      - python-grizzly-bitrot-jobs
+      - python-havana-bitrot-jobs
      - openstack-publish-jobs
      - translation-jobs

@ -406,6 +409,7 @@
    jobs:
      - python-jobs
      - python-grizzly-bitrot-jobs
+      - python-havana-bitrot-jobs
      - openstack-publish-jobs
      - translation-jobs

@ -456,6 +460,7 @@
    jobs:
      - python-jobs
      - python-grizzly-bitrot-jobs
+      - python-havana-bitrot-jobs
      - openstack-publish-jobs


@ -516,6 +521,7 @@
    jobs:
      - python-jobs
      - python-grizzly-bitrot-jobs
+      - python-havana-bitrot-jobs
      - openstack-publish-jobs
      - translation-jobs

@ -575,6 +581,7 @@
    jobs:
      - python-jobs
      - python-grizzly-bitrot-jobs
+      - python-havana-bitrot-jobs
      - openstack-publish-jobs
      - gate-{name}-pylint
      - translation-jobs
@ -769,6 +776,7 @@
    jobs:
      - python-jobs
      - python-grizzly-bitrot-jobs
+      - python-havana-bitrot-jobs
      - openstack-publish-jobs
      - translation-jobs

@ -974,6 +982,9 @@
      - '{pipeline}-swift-devstack-vm-functional':
          pipeline: check
          node: 'devstack-precise || devstack-precise-check'
+      - 'periodic-swift-devstack-vm-functional-stable-{release}':
+          release: havana
+          node: 'devstack-precise || devstack-precise-check'
 # No one is interested in stable/ branches on swift, so don't run bitrot jobs


@ -1000,27 +1011,11 @@
      - devstack-jobs:
          pipeline: check
          node: 'devstack-precise || devstack-precise-check'
-      - 'check-devstack-vm-cells-stable-{release}':
+      - devstack-stable-check-jobs:
          release:
            - grizzly
            - havana
-      - 'check-tempest-devstack-vm-cells-stable-{release}':
-          release:
-            - grizzly
-            - havana
-      - 'check-tempest-devstack-vm-cells-full-stable-{release}':
-          release:
-            - grizzly
-            - havana
-      - 'check-tempest-devstack-vm-full-stable-{release}':
-          release:
-            - grizzly
-            - havana
-      - 'check-tempest-devstack-vm-neutron-stable-{release}':
-          release:
-            - grizzly
-            - havana
-      - 'check-tempest-devstack-vm-postgres-full-stable-{release}':
+      - devstack-stable-periodic-jobs:
          release:
            - grizzly
            - havana
--- a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
@ -106,3 +106,15 @@
      - 'periodic-{name}-python26-{branch-name}'
      - 'periodic-{name}-python27-{branch-name}'
      - 'periodic-{name}-docs-{branch-name}'
+
+
+- job-group:
+    name: python-havana-bitrot-jobs
+    branch: 'stable/havana'
+    branch-name: 'stable-havana'
+    email: openstack-stable-maint@lists.openstack.org
+    node: precise
+    jobs:
+      - 'periodic-{name}-python26-{branch-name}'
+      - 'periodic-{name}-python27-{branch-name}'
+      - 'periodic-{name}-docs-{branch-name}'
--- a/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml
@ -31,3 +31,42 @@
    publishers:
      - devstack-logs
      - console-log
+
+
+- job-template:
+    name: 'periodic-swift-devstack-vm-functional-stable-{release}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 120
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export ZUUL_BRANCH=stable/{release}
+          unset ZUUL_PROJECT
+
+          function post_test_hook {{
+              cd /opt/stack/new/swift
+              # Launch V2 auth tests and v1 tests after.
+              bash .functests --verbosity=3 && \
+                  SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \
+                      bash .functests --verbosity=3
+          }}
+          export -f post_test_hook
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-qa@lists.openstack.org
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@ -165,6 +165,12 @@ jobs:
    voting: false
  - name: check-tempest-devstack-vm-cells-full-stable-grizzly
    voting: false
+  - name: check-devstack-vm-cells-stable-havana
+    voting: false
+  - name: check-tempest-devstack-vm-cells-stable-havana
+    voting: false
+  - name: check-tempest-devstack-vm-cells-full-stable-havana
+    voting: false
  - name: gate-nova-pylint
    voting: false
  - name: gate-cinder-pylint
@ -641,6 +647,9 @@ projects:
      - periodic-cinder-docs-stable-grizzly
      - periodic-cinder-python26-stable-grizzly
      - periodic-cinder-python27-stable-grizzly
+      - periodic-cinder-docs-stable-havana
+      - periodic-cinder-python26-stable-havana
+      - periodic-cinder-python27-stable-havana

  - name: openstack/glance
    check:
@ -685,6 +694,9 @@ projects:
      - periodic-glance-docs-stable-grizzly
      - periodic-glance-python26-stable-grizzly
      - periodic-glance-python27-stable-grizzly
+      - periodic-glance-docs-stable-havana
+      - periodic-glance-python26-stable-havana
+      - periodic-glance-python27-stable-havana

  - name: openstack/horizon
    check:
@ -732,6 +744,9 @@ projects:
      - periodic-horizon-docs-stable-grizzly
      - periodic-horizon-python26-stable-grizzly
      - periodic-horizon-python27-stable-grizzly
+      - periodic-horizon-docs-stable-havana
+      - periodic-horizon-python26-stable-havana
+      - periodic-horizon-python27-stable-havana

  - name: openstack/django_openstack_auth
    check:
@ -802,6 +817,10 @@ projects:
      - periodic-keystone-docs-stable-grizzly
      - periodic-keystone-python26-stable-grizzly
      - periodic-keystone-python27-stable-grizzly
+      - periodic-keystone-docs-stable-havana
+      - periodic-keystone-python26-stable-havana
+      - periodic-keystone-python27-stable-havana
+      - periodic-swift-devstack-vm-functional-stable-havana

  - name: openstack/nova
    check:
@ -850,6 +869,9 @@ projects:
      - periodic-nova-docs-stable-grizzly
      - periodic-nova-python26-stable-grizzly
      - periodic-nova-python27-stable-grizzly
+      - periodic-nova-docs-stable-havana
+      - periodic-nova-python26-stable-havana
+      - periodic-nova-python27-stable-havana

  - name: openstack/openstack
    check:
@ -1045,6 +1067,9 @@ projects:
      - periodic-neutron-docs-stable-grizzly
      - periodic-neutron-python26-stable-grizzly
      - periodic-neutron-python27-stable-grizzly
+      - periodic-neutron-docs-stable-havana
+      - periodic-neutron-python26-stable-havana
+      - periodic-neutron-python27-stable-havana

  - name: openstack/swift
    check:
@ -1589,6 +1614,12 @@ projects:
      - check-devstack-vm-cells-stable-grizzly
      - check-tempest-devstack-vm-cells-stable-grizzly
      - check-tempest-devstack-vm-cells-full-stable-grizzly
+      - check-tempest-devstack-vm-full-stable-havana
+      - check-tempest-devstack-vm-neutron-stable-havana
+      - check-tempest-devstack-vm-postgres-full-stable-havana
+      - check-devstack-vm-cells-stable-havana
+      - check-tempest-devstack-vm-cells-stable-havana
+      - check-tempest-devstack-vm-cells-full-stable-havana
    gate:
      - gate-tempest-devstack-vm-full
      - gate-tempest-devstack-vm-postgres-full
@ -1653,12 +1684,18 @@ projects:
      - tempest-docs
      - tempest-branch-tarball
    periodic:
-      - periodic-tempest-devstack-vm-stable-grizzly
+      - periodic-tempest-devstack-vm-full-stable-grizzly
      - periodic-tempest-devstack-vm-neutron-stable-grizzly
-      - periodic-tempest-devstack-vm-postgres-stable-grizzly
-      - periodic-tempest-devstack-vm-all
-      - periodic-tempest-devstack-vm-coverage
-      - periodic-tempest-devstack-vm-stress
+      - periodic-tempest-devstack-vm-postgres-full-stable-grizzly
+      - periodic-tempest-devstack-vm-full-stable-havana
+      - periodic-tempest-devstack-vm-neutron-stable-havana
+      - periodic-tempest-devstack-vm-postgres-full-stable-havana
+      - periodic-tempest-devstack-vm-all-stable-havana
+      - periodic-tempest-devstack-vm-coverage-stable-havana
+      - periodic-tempest-devstack-vm-stress-stable-havana
+      - periodic-tempest-devstack-vm-neutron-pg-stable-havana
+      - periodic-tempest-devstack-vm-large-ops-stable-havana
+      - periodic-tempest-devstack-vm-neutron-large-ops-stable-havana

  - name: openstack/ceilometer
    check:
@ -1701,6 +1738,9 @@ projects:
      - periodic-ceilometer-docs-stable-grizzly
      - periodic-ceilometer-python26-stable-grizzly
      - periodic-ceilometer-python27-stable-grizzly
+      - periodic-ceilometer-docs-stable-havana
+      - periodic-ceilometer-python26-stable-havana
+      - periodic-ceilometer-python27-stable-havana

  - name: stackforge/clouddocs-maven-plugin
    check:
@ -1823,6 +1863,9 @@ projects:
      - periodic-heat-docs-stable-grizzly
      - periodic-heat-python26-stable-grizzly
      - periodic-heat-python27-stable-grizzly
+      - periodic-heat-docs-stable-havana
+      - periodic-heat-python26-stable-havana
+      - periodic-heat-python27-stable-havana
      - heat-propose-translation-update

  - name: openstack/python-heatclient