Merge "Add puppet6 testing"

.zuul.yaml

@@ -2,6 +2,7 @@
     name: puppet-openstack-base
     pre-run: playbooks/prepare-node-common.yaml
     abstract: true
+    nodeset: ubuntu-bionic
     vars:
       use_puppetlabs: false
 
@@ -283,6 +284,123 @@
     vars:
       ceph: luminous
 
+- job:
+    name: puppet-openstack-integration-6
+    parent: puppet-openstack-integration-run-base
+    abstract: true
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    vars:
+      puppet: 6
+
+- job:
+    name: puppet-openstack-integration-6-scenario001
+    parent: puppet-openstack-integration-6
+    abstract: true
+    vars:
+      scenario: scenario001
+      ceph: luminous
+
+- job:
+    name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+    parent: puppet-openstack-integration-6-scenario001
+    nodeset: ubuntu-bionic
+    vars:
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
+    parent: puppet-openstack-integration-6-scenario001
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
+    parent: puppet-openstack-integration-6-scenario001
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-6-scenario002
+    parent: puppet-openstack-integration-6
+    abstract: true
+    vars:
+      scenario: scenario002
+
+- job:
+    name: puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
+    parent: puppet-openstack-integration-6-scenario002
+    nodeset: ubuntu-bionic
+    # 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-6-scenario002-tempest-centos-7
+    parent: puppet-openstack-integration-6-scenario002
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-6-scenario002-tempest-debian-stable
+    parent: puppet-openstack-integration-6-scenario002
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-6-scenario003
+    parent: puppet-openstack-integration-6
+    abstract: true
+    vars:
+      scenario: scenario003
+
+- job:
+    name: puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
+    parent: puppet-openstack-integration-6-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-6-scenario003-tempest-centos-7
+    parent: puppet-openstack-integration-6-scenario003
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-6-scenario003-tempest-debian-stable
+    parent: puppet-openstack-integration-6-scenario003
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-6-scenario004
+    parent: puppet-openstack-integration-6
+    branches: ^(?!stable/newton).*$
+    abstract: true
+    vars:
+      scenario: scenario004
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
+    parent: puppet-openstack-integration-6-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-6-scenario004-tempest-centos-7-mimic
+    parent: puppet-openstack-integration-6-scenario004
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
+    parent: puppet-openstack-integration-6-scenario004
+    nodeset: debian-stable
+    vars:
+      ceph: luminous
+
 - project-template:
     name: puppet-openstack-integration-jobs-all
     check:
@@ -299,6 +417,14 @@
         - 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-6-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-6-scenario002-tempest-centos-7
+        - puppet-openstack-integration-6-scenario003-tempest-centos-7
+        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
+        - 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-4-scenario001-tempest-debian-stable-luminous:
             voting: false
         - puppet-openstack-integration-4-scenario002-tempest-debian-stable:
@@ -319,82 +445,110 @@
         - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
         - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
         - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-6-scenario002-tempest-centos-7
+        - puppet-openstack-integration-6-scenario003-tempest-centos-7
+        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
     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
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario001
     check:
       jobs:
         - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
         - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
         - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
         - puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous:
             voting: false
     gate:
       jobs:
         - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
         - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
         - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
     experimental:
       jobs:
         - puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
+        - 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-6-scenario002-tempest-ubuntu-bionic
         - puppet-openstack-integration-4-scenario002-tempest-centos-7
         - puppet-openstack-integration-5-scenario002-tempest-centos-7
+        - puppet-openstack-integration-6-scenario002-tempest-centos-7
         - puppet-openstack-integration-4-scenario002-tempest-debian-stable:
             voting: false
     gate:
       jobs:
         - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
         - puppet-openstack-integration-4-scenario002-tempest-centos-7
         - puppet-openstack-integration-5-scenario002-tempest-centos-7
+        - puppet-openstack-integration-6-scenario002-tempest-centos-7
     experimental:
       jobs:
         - puppet-openstack-integration-5-scenario002-tempest-debian-stable
+        - 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-6-scenario003-tempest-ubuntu-bionic
         - puppet-openstack-integration-4-scenario003-tempest-centos-7
         - puppet-openstack-integration-5-scenario003-tempest-centos-7
+        - puppet-openstack-integration-6-scenario003-tempest-centos-7
         - puppet-openstack-integration-4-scenario003-tempest-debian-stable:
             voting: false
     gate:
       jobs:
         - puppet-openstack-integration-4-scenario003-tempest-centos-7
         - puppet-openstack-integration-5-scenario003-tempest-centos-7
+        - puppet-openstack-integration-6-scenario003-tempest-centos-7
     experimental:
       jobs:
         - puppet-openstack-integration-5-scenario003-tempest-debian-stable
+        - 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-6-scenario004-tempest-ubuntu-bionic-mimic
         - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
         - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
         - puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous:
             voting: false
     gate:
       jobs:
         - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
         - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
     experimental:
       jobs:
         - puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
+        - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
 
 - job:
     name: puppet-openstack-module-base
@@ -413,7 +567,7 @@
       - ^test-requirements.txt$
 
 - job:
-    name: puppet-openstack-syntax
+    name: puppet-openstack-syntax-base
     parent: puppet-openstack-module-base
     run: playbooks/run-syntax-tests.yaml
     irrelevant-files:
@@ -430,16 +584,22 @@
 
 - job:
     name: puppet-openstack-syntax-4
-    parent: puppet-openstack-syntax
+    parent: puppet-openstack-syntax-base
     vars:
       puppet: 4
 
 - job:
     name: puppet-openstack-syntax-5
-    parent: puppet-openstack-syntax
+    parent: puppet-openstack-syntax-base
     vars:
       puppet: 5
 
+- job:
+    name: puppet-openstack-syntax-6
+    parent: puppet-openstack-syntax-base
+    vars:
+      puppet: 6
+
 - job:
     name: puppet-openstack-unit-base
     parent: puppet-openstack-integration-base
@@ -473,6 +633,14 @@
     vars:
       puppet_gem_version: 5.5
 
+- job:
+    name: puppet-openstack-unit-6.0-ubuntu-bionic
+    parent: puppet-openstack-unit-base
+    nodeset: ubuntu-bionic
+    branches: ^master
+    vars:
+      puppet_gem_version: 6.0
+
 - job:
     name: puppet-openstack-unit-latest-ubuntu-bionic
     parent: puppet-openstack-unit-base
@@ -488,11 +656,13 @@
       jobs:
         - puppet-openstack-unit-4.8-centos-7
         - puppet-openstack-unit-5.5-centos-7
+        - puppet-openstack-unit-6.0-ubuntu-bionic
         - puppet-openstack-unit-latest-ubuntu-bionic
     gate:
       jobs:
         - puppet-openstack-unit-4.8-centos-7
         - puppet-openstack-unit-5.5-centos-7
+        - puppet-openstack-unit-6.0-ubuntu-bionic
 
 - project-template:
     name: puppet-openstack-check-jobs
@@ -501,11 +671,13 @@
         - puppet-openstack-lint
         - puppet-openstack-syntax-4
         - puppet-openstack-syntax-5
+        - puppet-openstack-syntax-6
     gate:
       jobs:
         - puppet-openstack-lint
         - puppet-openstack-syntax-4
         - puppet-openstack-syntax-5
+        - puppet-openstack-syntax-6
 
 - project:
     templates:
@@ -639,6 +811,13 @@
     vars:
       puppet: 5
 
+- job:
+    name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
+    parent: puppet-openstack-libraries-puppet-syntax
+    nodeset: ubuntu-bionic
+    vars:
+      puppet: 6
+
 - job:
     name: puppet-openstack-libraries-puppet-unit-base
     parent: puppet-openstack-integration-base
@@ -670,6 +849,14 @@
     vars:
       puppet_gem_version: 5.5
 
+- job:
+    name: puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
+    parent: puppet-openstack-libraries-puppet-unit-base
+    branches: ^master
+    nodeset: ubuntu-bionic
+    vars:
+      puppet_gem_version: 6.0
+
 - job:
     name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
     parent: puppet-openstack-libraries-puppet-unit-base
@@ -727,9 +914,6 @@
       jobs:
         - tripleo-puppet-ci-centos-7-standalone
 
-
-
-
 - project-template:
     name: puppet-openstack-library-jobs
     check:
@@ -737,8 +921,10 @@
         - puppet-openstack-libraries-puppet-lint-centos-7
         - puppet-openstack-libraries-puppet-syntax-4-centos-7
         - puppet-openstack-libraries-puppet-syntax-5-centos-7
+        - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
         - puppet-openstack-libraries-puppet-unit-4.8-centos-7
         - puppet-openstack-libraries-puppet-unit-5.5-centos-7
+        - puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
         - puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
         - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
@@ -747,7 +933,9 @@
         - puppet-openstack-libraries-puppet-lint-centos-7
         - puppet-openstack-libraries-puppet-syntax-4-centos-7
         - puppet-openstack-libraries-puppet-syntax-5-centos-7
+        - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
         - puppet-openstack-libraries-puppet-unit-4.8-centos-7
         - puppet-openstack-libraries-puppet-unit-5.5-centos-7
+        - puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
         - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic

functions

@@ -142,8 +142,8 @@ install_puppet() {
         if [ "${MANAGE_REPOS}" == "true" ] ; then
             if [ $PUPPET_MAJ_VERSION == 4 ]; then
                 local PUPPET_APT_POOL="PC1"
-            elif [ $PUPPET_MAJ_VERSION == 5 ]; then
+            else
-                local PUPPET_APT_POOL="puppet5"
+                local PUPPET_APT_POOL="puppet${PUPPET_MAJ_VERSION}"
             fi
             PUPPET_CODENAME=$(lsb_release -s -c)
             if [ $PUPPET_CODENAME == "bionic" ]; then
@@ -166,8 +166,8 @@ install_puppet() {
         if [ "${MANAGE_REPOS}" == "true" ] ; then
             if [ $PUPPET_MAJ_VERSION == 4 ]; then
                 local PUPPET_YUM_SUFFIX="/el/7/PC1/x86_64/"
-            elif [ $PUPPET_MAJ_VERSION == 5 ]; then
+            else
-                local PUPPET_YUM_SUFFIX="/puppet5/el/7/x86_64/"
+                local PUPPET_YUM_SUFFIX="/puppet${PUPPET_MAJ_VERSION}/el/7/x86_64/"
             fi
             $SUDO rpm --import files/GPG-KEY-puppetlabs
             $SUDO rpm --import files/GPG-KEY-puppet

run_tests.sh

@@ -17,7 +17,6 @@ export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
 source ${SCRIPT_DIR}/functions
 
 export WORKSPACE=${WORKSPACE:-/tmp}
-export PUPPET_URL_SUFFIX=
 export CEPH_VERSION=${CEPH_VERSION:-mimic}
 export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-5}
 export SCENARIO=${SCENARIO:-scenario001}
@@ -44,21 +43,9 @@ export IMG_DIR=${IMG_DIR:-'/tmp/openstack/image'}
 export WRITE_FACTS=false
 source ${SCRIPT_DIR}/configure_facts.sh
 
-
+export PATH=${PATH}:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin
-if [ $PUPPET_MAJ_VERSION == 4 ]; then
+export PUPPET_BASE_PATH=/etc/puppetlabs/code
-  export PATH=${PATH}:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin
+export PUPPET_PKG=${PUPPET_PKG:-puppet-agent}
-  export PUPPET_RELEASE_FILE=puppetlabs-release-pc1
-  export PUPPET_BASE_PATH=/etc/puppetlabs/code
-  export PUPPET_PKG=${PUPPET_PKG:-puppet-agent}
-elif [ $PUPPET_MAJ_VERSION == 5 ]; then
-  export PATH=${PATH}:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin
-  export PUPPET_RELEASE_FILE=puppet5-nightly-release
-  export PUPPET_BASE_PATH=/etc/puppetlabs/code
-  export PUPPET_PKG=${PUPPET_PKG:-puppet-agent}
-  if is_fedora; then
-      PUPPET_URL_SUFFIX='puppet5-nightly/'
-  fi
-fi
 
 print_header 'Start (run_tests.sh)'