openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Unpin rspec-puppet"

Browse Source
This commit is contained in:
Zuul 2023-05-22 12:07:26 +00:00 committed by Gerrit Code Review
commit be675977f3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

5
playbooks/run-unit-tests.yaml
View File

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

6
zuul.d/base.yaml
View File

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