openstack/puppet-openstack-integration
Code Issues Proposed changes

Unpin rspec-puppet

Browse Source 
Depends-on: https://review.opendev.org/883458
Change-Id: If88812340f50b952fb657e32e9f497f4e140e0f6
This commit is contained in:
Takashi Kajinami 2023-05-18 13:19:56 +09:00
parent 8ceae6efef
commit 3fde8d655e
3 changed files with 8 additions and 8 deletions

5
playbooks/run-libraries-unit-tests.yaml

@ -7,8 +7,9 @@
if [ "{{ puppet_gem_version }}" != "latest" ]; then
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
fi
# TODO(tobias-urdin): Remove when we dont pin rspec-puppet
export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
if [ "{{ rspec_puppet_version }}" != "latest" ]; then
export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
fi
# NOTE(aschultz): rspec-puppet 2.4+ has strict variables enabled
# which causes test failures. The problem is that the puppet modules
# have never worked with strict_variables = true due to backwards

5
playbooks/run-unit-tests.yaml

@ -6,8 +6,9 @@
if [ "{{ puppet_gem_version }}" != "latest" ]; then
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
fi
# TODO(tobias-urdin): Remove when we dont pin rspec-puppet
export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
if [ "{{ rspec_puppet_version }}" != "latest" ]; then
export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
fi
# NOTE(aschultz): rspec-puppet 2.4+ has strict variables enabled
# which causes test failures. The problem is that the puppet modules
# have never worked with strict_variables = true due to backwards

6
zuul.d/base.yaml

@ -137,8 +137,7 @@
- ^setup.py$
- ^tox.ini$
vars:
# NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
rspec_puppet_version: '~> 2.10.0'
rspec_puppet_version: 'latest'
- job:
name: puppet-openstack-libraries-puppet-unit-base
@ -164,5 +163,4 @@
- ^setup.py$
- ^tox.ini$
vars:
# NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
rspec_puppet_version: '~> 2.10.0'
rspec_puppet_version: 'latest'