From 28e073a14e904fba3b0ca6d226cf598c1c414af7 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 19 Jun 2018 11:01:33 -0600
Subject: [PATCH] Update integration jobs

This change aims to switch the puppet4 versions of the integration jobs
to only be run in <=Queens. The puppet5 integration jobs would become
voting and be run for >=Rocky.  Puppet 4 unit coverage still remains and
we'll have additional puppet 4 deployment coverage with the TripleO jobs
being added via If97e1f910c86a794edc79b6141b79f64ca4793cf.

Change-Id: I67dd58fac6957f599d26df6de0ee12b22916fd54
---
 .zuul.yaml | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 32c4d7e1e..173315299 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,11 +1,13 @@
 - job:
     name: puppet-openstack-base
     pre-run: playbooks/prepare-node-common.yaml
+    abstract: true
     vars:
       use_puppetlabs: false
 
 - job:
     name: puppet-openstack-integration-base
+    abstract: true
     parent: puppet-openstack-base
     required-projects:
       - openstack/openstack
@@ -55,6 +57,7 @@
 - job:
     name: puppet-openstack-integration-run-base
     parent: puppet-openstack-integration-base
+    abstract: true
     pre-run: playbooks/prepare-node-integration.yaml
     run: playbooks/run-integration-tests.yaml
     post-run: playbooks/upload-logs.yaml
@@ -75,76 +78,92 @@
 - job:
     name: puppet-openstack-integration-4
     parent: puppet-openstack-integration-run-base
+    abstract: true
     vars:
       puppet: 4
 
 - job:
     name: puppet-openstack-integration-4-scenario001
     parent: puppet-openstack-integration-4
+    abstract: true
     vars:
       scenario: scenario001
 
 - job:
     name: puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
     parent: puppet-openstack-integration-4-scenario001
+    branches: ^stable/(newton|ocata|pike|queens).*$
     nodeset: ubuntu-xenial
 
 - job:
     name: puppet-openstack-integration-4-scenario001-tempest-centos-7
     parent: puppet-openstack-integration-4-scenario001
+    branches: ^stable/(newton|ocata|pike|queens).*$
     nodeset: centos-7
 
 - job:
     name: puppet-openstack-integration-4-scenario001-tempest-debian-stable
     parent: puppet-openstack-integration-4-scenario001
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
     nodeset: debian-stable
 
 - job:
     name: puppet-openstack-integration-4-scenario002
     parent: puppet-openstack-integration-4
+    abstract: true
     vars:
       scenario: scenario002
 
 - job:
     name: puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
     parent: puppet-openstack-integration-4-scenario002
+    branches: ^stable/(newton|ocata|pike|queens).*$
     nodeset: ubuntu-xenial
 
 - job:
     name: puppet-openstack-integration-4-scenario002-tempest-centos-7
     parent: puppet-openstack-integration-4-scenario002
+    branches: ^stable/(newton|ocata|pike|queens).*$
     nodeset: centos-7
 
 - job:
     name: puppet-openstack-integration-4-scenario002-tempest-debian-stable
     parent: puppet-openstack-integration-4-scenario002
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
     nodeset: debian-stable
 
 - job:
     name: puppet-openstack-integration-4-scenario003
     parent: puppet-openstack-integration-4
+    abstract: true
     vars:
       scenario: scenario003
 
 - job:
     name: puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
     parent: puppet-openstack-integration-4-scenario003
+    branches: ^stable/(newton|ocata|pike|queens).*$
     nodeset: ubuntu-xenial
 
 - job:
     name: puppet-openstack-integration-4-scenario003-tempest-centos-7
     parent: puppet-openstack-integration-4-scenario003
+    branches: ^stable/(newton|ocata|pike|queens).*$
     nodeset: centos-7
 
 - job:
     name: puppet-openstack-integration-4-scenario003-tempest-debian-stable
     parent: puppet-openstack-integration-4-scenario003
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
     nodeset: debian-stable
 
 - job:
     name: puppet-openstack-integration-4-scenario004
     parent: puppet-openstack-integration-4
-    branches: ^(?!stable/newton).*$
+    abstract: true
+    # TODO(aschultz): need to move this seperately because zuul doesn't like
+    # this.
+    branches: ^(stable/(ocata|pike|queens)).*$
     vars:
       scenario: scenario004
 
@@ -161,18 +180,21 @@
 - job:
     name: puppet-openstack-integration-4-scenario004-tempest-debian-stable
     parent: puppet-openstack-integration-4-scenario004
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
     nodeset: debian-stable
 
 - job:
     name: puppet-openstack-integration-5
     parent: puppet-openstack-integration-run-base
-    voting: false
+    abstract: true
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
     vars:
       puppet: 5
 
 - job:
     name: puppet-openstack-integration-5-scenario001
     parent: puppet-openstack-integration-5
+    abstract: true
     vars:
       scenario: scenario001
 
@@ -194,6 +216,7 @@
 - job:
     name: puppet-openstack-integration-5-scenario002
     parent: puppet-openstack-integration-5
+    abstract: true
     vars:
       scenario: scenario002
 
@@ -215,6 +238,7 @@
 - job:
     name: puppet-openstack-integration-5-scenario003
     parent: puppet-openstack-integration-5
+    abstract: true
     vars:
       scenario: scenario003
 
@@ -237,6 +261,7 @@
     name: puppet-openstack-integration-5-scenario004
     parent: puppet-openstack-integration-5
     branches: ^(?!stable/newton).*$
+    abstract: true
     vars:
       scenario: scenario004
 
@@ -509,6 +534,7 @@
 - job:
     name: puppet-openstack-beaker-run-base
     parent: puppet-openstack-integration-base
+    abstract: true
     pre-run: playbooks/prepare-node-beaker.yaml
     post-run: playbooks/upload-logs.yaml
     run: playbooks/run-beaker-tests.yaml