From 7f6af05a3d57f325b53e248520ae61e15ed5880f Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 6 Aug 2014 15:51:10 -0700
Subject: [PATCH] Add ironic and neutron sideways upgrade jobs

Add new ironic and neutron sideways upgrade jobs (jobs that upgrade to
ironic and neutron from the services they replace and not across
releases) to the experimental queues of neutron, ironic, grenade, and
devstack-gate. This will allow us to test and maintain a viable
migration path from nova network to neutron and from nova baremetal to
ironic.

Change-Id: I7cc3ec53b9d9282763c4003b8aa791d6430321ad
---
 .../config/devstack-gate.yaml                 | 66 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  |  7 ++
 2 files changed, 73 insertions(+)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index 338462f912..1402fd554b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -1150,6 +1150,70 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-grenade-dsvm-ironic-sideways{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_GRENADE=sideways
+          export DEVSTACK_GATE_IRONIC=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job-template:
+    name: '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_GRENADE=sideways
+          export DEVSTACK_GATE_NEUTRON=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-template:
     name: '{pipeline}-tempest-dsvm-all{branch-designator}'
     node: '{node}'
@@ -1411,6 +1475,8 @@
       - '{pipeline}-grenade-dsvm-neutron{branch-designator}'
       - '{pipeline}-grenade-dsvm-neutron-forward{branch-designator}'
       - '{pipeline}-grenade-dsvm-partial-ncpu{branch-designator}'
+      - '{pipeline}-grenade-dsvm-ironic-sideways{branch-designator}'
+      - '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}'
       - '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 9134a05eaf..611d01dd00 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1017,6 +1017,8 @@ projects:
       - gate-tempest-dsvm-ironic
       - gate-tempest-dsvm-ironic-postgres
       - gate-tempest-dsvm-virtual-ironic
+    experimental:
+      - check-grenade-dsvm-ironic-sideways
     pre-release:
       - ironic-tarball
     release:
@@ -1124,6 +1126,7 @@ projects:
       - check-neutron-dsvm-api
       - gate-grenade-dsvm-neutron-forward
       - check-tempest-dsvm-neutron-dvr
+      - check-grenade-dsvm-neutron-sideways
     experimental-tripleo:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
@@ -2522,6 +2525,8 @@ projects:
       - gate-grenade-dsvm-partial-ncpu
     experimental:
       - gate-grenade-dsvm-neutron-forward
+      - check-grenade-dsvm-ironic-sideways
+      - check-grenade-dsvm-neutron-sideways
 
   - name: openstack-dev/hacking
     template:
@@ -2698,6 +2703,8 @@ projects:
       - check-tempest-dsvm-aiopcpu
       - check-tempest-dsvm-neutron-aiopcpu
       - check-tempest-dsvm-centos7
+      - check-grenade-dsvm-ironic-sideways
+      - check-grenade-dsvm-neutron-sideways
     experimental-tripleo:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha