From d148836bf4d6855d3fc51e3ffe60b0cffa85b29b Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 10 Oct 2019 14:57:50 +0200
Subject: [PATCH] Test Puppet 6 for Train

Change-Id: I447827fb99cb1d168a6d16a9c3fbf47f8abd2c46
---
 zuul.d/libraries.yaml | 2 +-
 zuul.d/linters.yaml   | 4 ++--
 zuul.d/unit.yaml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml
index 8955e5f5a..0b8c5cf85 100644
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@@ -20,7 +20,7 @@
 - job:
     name: puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic
     parent: puppet-openstack-libraries-puppet-unit-base
-    branches: ^(stable/stein|master)$
+    branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
     nodeset: ubuntu-bionic
     vars:
       puppet_gem_version: 6.4
diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml
index 4752f4f9c..7352161e4 100644
--- a/zuul.d/linters.yaml
+++ b/zuul.d/linters.yaml
@@ -25,7 +25,7 @@
 - job:
     name: puppet-openstack-syntax-6-ubuntu-bionic
     parent: puppet-openstack-syntax-base
-    branches: ^(stable/stein|master)$
+    branches: ^(?!stable/(ocata|pike|queens|rocky|jewel|mimic|luminous)).*$
     vars:
       puppet: 6
 
@@ -71,6 +71,6 @@
 - job:
     name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
     parent: puppet-openstack-libraries-puppet-syntax
-    branches: ^(stable/stein|master)$
+    branches: ^(?!stable/(ocata|pike|queens|rocky|jewel|mimic|luminous)).*$
     vars:
       puppet: 6
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index b2783e990..2eea8be63 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -20,7 +20,7 @@
     name: puppet-openstack-unit-6.4-ubuntu-bionic
     parent: puppet-openstack-unit-base
     nodeset: ubuntu-bionic
-    branches: ^(stable/stein|master)$
+    branches: ^(?!stable/(ocata|pike|queens|rocky|jewel|mimic|luminous)).*$
     vars:
       puppet_gem_version: 6.4