Merge "Set selective rspec-puppet versions"

playbooks/run-libraries-unit-tests.yaml

@@ -12,6 +12,8 @@
               export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0'
             fi
           fi
+          # TODO(tobias-urdin): Remove when we dont pin rspec-puppet
+          export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
           ./run_unit_tests.sh
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'

playbooks/run-unit-tests.yaml

@@ -11,6 +11,8 @@
               export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0'
             fi
           fi
+          # TODO(tobias-urdin): Remove when we dont pin rspec-puppet
+          export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
           ruby <<EOF

zuul.d/base.yaml

@@ -126,6 +126,9 @@
       - ^.gitignore$
       - ^setup.cfg$
       - ^setup.py$
+    # TODO(tobias-urdin): Remove when we use rspec-puppet 2.7.1
+    vars:
+      rspec_puppet_version: '~> 2.3.0'
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-base
@@ -145,6 +148,9 @@
       - ^.gitignore$
       - ^setup.cfg$
       - ^setup.py$
+    # TODO(tobias-urdin): Remove when we use rspec-puppet 2.7.1
+    vars:
+      rspec_puppet_version: '~> 2.3.0'
 
 - job:
     name: puppet-openstack-beaker-run-base

zuul.d/libraries.yaml

@@ -32,3 +32,6 @@
     voting: false
     vars:
       puppet_gem_version: latest
+      # TODO(tobias-urdin): Remove this when we 2.7.1 works without
+      # any issues and we can leave it not pinned to anything.
+      rspec_puppet_version: '= 2.7.1'

zuul.d/unit.yaml

@@ -31,7 +31,9 @@
     voting: false
     vars:
       puppet_gem_version: latest
-
+      # TODO(tobias-urdin): Remove this when we 2.7.1 works without
+      # any issues and we can leave it not pinned to anything.
+      rspec_puppet_version: '= 2.7.1'
 
 - project-template:
     name: puppet-openstack-module-unit-jobs