Only run Puppet 6 for integrations

We are finally in Victoria and Puppet 5 is no
longer supported. This removes all Puppet 5
integration testing and moves the Puppet 6
testing from experimental back to check/gate.

This keeps Puppet 5 syntax and unit as a courtesy
until we start introducing Puppet 6 only features
but we don't need to keep backward compatibility
with Puppet 5.

Change-Id: Idc7fcb9538eaa2769a77ec256048d4cef0d1b9ec

zuul.d/integration.yaml

@@ -1,121 +1,4 @@
 ---
-- job:
-    name: puppet-openstack-integration-5
-    parent: puppet-openstack-integration-run-base
-    abstract: true
-    vars:
-      puppet: 5
-
-- job:
-    name: puppet-openstack-integration-5-scenario001
-    parent: puppet-openstack-integration-5
-    abstract: true
-    vars:
-      scenario: scenario001
-      ceph: luminous
-
-- job:
-    name: puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-    parent: puppet-openstack-integration-5-scenario001
-    nodeset: ubuntu-bionic
-    voting: false
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-5-scenario001-tempest-centos-8
-    parent: puppet-openstack-integration-5-scenario001
-    nodeset: centos-8
-
-- job:
-    name: puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
-    parent: puppet-openstack-integration-5-scenario001
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-5-scenario002
-    parent: puppet-openstack-integration-5
-    abstract: true
-    vars:
-      scenario: scenario002
-
-- job:
-    name: puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-    parent: puppet-openstack-integration-5-scenario002
-    nodeset: ubuntu-bionic
-    voting: false
-    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-5-scenario002-tempest-centos-8
-    parent: puppet-openstack-integration-5-scenario002
-    nodeset: centos-8
-
-- job:
-    name: puppet-openstack-integration-5-scenario002-tempest-debian-stable
-    parent: puppet-openstack-integration-5-scenario002
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-5-scenario003
-    parent: puppet-openstack-integration-5
-    abstract: true
-    vars:
-      scenario: scenario003
-
-- job:
-    name: puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
-    parent: puppet-openstack-integration-5-scenario003
-    nodeset: ubuntu-bionic
-    voting: false
-    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-5-scenario003-tempest-centos-8
-    parent: puppet-openstack-integration-5-scenario003
-    nodeset: centos-8
-
-- job:
-    name: puppet-openstack-integration-5-scenario003-tempest-debian-stable
-    parent: puppet-openstack-integration-5-scenario003
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-5-scenario004
-    parent: puppet-openstack-integration-5
-    abstract: true
-    vars:
-      scenario: scenario004
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
-    parent: puppet-openstack-integration-5-scenario004
-    nodeset: ubuntu-bionic
-    voting: false
-    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-5-scenario004-tempest-centos-8
-    parent: puppet-openstack-integration-5-scenario004
-    nodeset: centos-8
-
-- job:
-    name: puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
-    parent: puppet-openstack-integration-5-scenario004
-    nodeset: debian-stable
-    vars:
-      ceph: luminous
-
 - job:
     name: puppet-openstack-integration-6
     parent: puppet-openstack-integration-run-base
@@ -135,6 +18,7 @@
     name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
     parent: puppet-openstack-integration-6-scenario001
     nodeset: ubuntu-bionic
+    voting: false
     vars:
       ceph: mimic
 
@@ -159,6 +43,7 @@
     name: puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
     parent: puppet-openstack-integration-6-scenario002
     nodeset: ubuntu-bionic
+    voting: false
     # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
     # luminous is not packaged for Bionic repos.pp will fail otherwise.
     vars:

zuul.d/layout.yaml

@@ -53,101 +53,77 @@
     name: puppet-openstack-integration-jobs-all
     check:
       jobs:
-        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
-        - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-5-scenario001-tempest-centos-8
-        - puppet-openstack-integration-5-scenario002-tempest-centos-8
-        - puppet-openstack-integration-5-scenario003-tempest-centos-8
-        - puppet-openstack-integration-5-scenario004-tempest-centos-8
-    gate:
-      jobs:
-        - puppet-openstack-integration-5-scenario001-tempest-centos-8
-        - puppet-openstack-integration-5-scenario002-tempest-centos-8
-        - puppet-openstack-integration-5-scenario003-tempest-centos-8
-        - puppet-openstack-integration-5-scenario004-tempest-centos-8
-    experimental:
-      jobs:
-        - puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
-        - puppet-openstack-integration-5-scenario002-tempest-debian-stable
-        - puppet-openstack-integration-5-scenario003-tempest-debian-stable
-        - puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
-        - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
-        - puppet-openstack-integration-6-scenario002-tempest-debian-stable
-        - puppet-openstack-integration-6-scenario003-tempest-debian-stable
-        - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
-        - puppet-openstack-integration-6-scenario001-tempest-centos-8
-        - puppet-openstack-integration-6-scenario002-tempest-centos-8
-        - puppet-openstack-integration-6-scenario003-tempest-centos-8
-        - puppet-openstack-integration-6-scenario004-tempest-centos-8
         - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
         - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
         - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
         - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-centos-8
+        - puppet-openstack-integration-6-scenario002-tempest-centos-8
+        - puppet-openstack-integration-6-scenario003-tempest-centos-8
+        - puppet-openstack-integration-6-scenario004-tempest-centos-8
+    gate:
+      jobs:
+        - puppet-openstack-integration-6-scenario001-tempest-centos-8
+        - puppet-openstack-integration-6-scenario002-tempest-centos-8
+        - puppet-openstack-integration-6-scenario003-tempest-centos-8
+        - puppet-openstack-integration-6-scenario004-tempest-centos-8
+    experimental:
+      jobs:
+        - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
+        - puppet-openstack-integration-6-scenario002-tempest-debian-stable
+        - puppet-openstack-integration-6-scenario003-tempest-debian-stable
+        - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario001
     check:
       jobs:
-        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-5-scenario001-tempest-centos-8
-    gate:
-      jobs:
-        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-5-scenario001-tempest-centos-8
-    experimental:
-      jobs:
-        - puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
-        - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
         - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
         - puppet-openstack-integration-6-scenario001-tempest-centos-8
+    gate:
+      jobs:
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-centos-8
+    experimental:
+      jobs:
+        - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario002
     check:
       jobs:
-        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-5-scenario002-tempest-centos-8
-    gate:
-      jobs:
-        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-5-scenario002-tempest-centos-8
-    experimental:
-      jobs:
-        - puppet-openstack-integration-5-scenario002-tempest-debian-stable
-        - puppet-openstack-integration-6-scenario002-tempest-debian-stable
         - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
         - puppet-openstack-integration-6-scenario002-tempest-centos-8
+    gate:
+      jobs:
+        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario002-tempest-centos-8
+    experimental:
+      jobs:
+        - puppet-openstack-integration-6-scenario002-tempest-debian-stable
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario003
     check:
       jobs:
-        - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
-        - puppet-openstack-integration-5-scenario003-tempest-centos-8
-    gate:
-      jobs:
-        - puppet-openstack-integration-5-scenario003-tempest-centos-8
-    experimental:
-      jobs:
-        - puppet-openstack-integration-5-scenario003-tempest-debian-stable
-        - puppet-openstack-integration-6-scenario003-tempest-debian-stable
         - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
         - puppet-openstack-integration-6-scenario003-tempest-centos-8
+    gate:
+      jobs:
+        - puppet-openstack-integration-6-scenario003-tempest-centos-8
+    experimental:
+      jobs:
+        - puppet-openstack-integration-6-scenario003-tempest-debian-stable
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario004
     check:
       jobs:
-        - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-5-scenario004-tempest-centos-8
-    gate:
-      jobs:
-        - puppet-openstack-integration-5-scenario004-tempest-centos-8
-    experimental:
-      jobs:
-        - puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
-        - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
         - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
         - puppet-openstack-integration-6-scenario004-tempest-centos-8
+    gate:
+      jobs:
+        - puppet-openstack-integration-6-scenario004-tempest-centos-8
+    experimental:
+      jobs:
+        - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous