openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Unpin puppet gem version selection"

Browse Source
This commit is contained in:
Zuul 2019-01-28 17:38:47 +00:00 committed by Gerrit Code Review
commit 409c1ea758
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,12 +5,7 @@
set -e set -e
set -x set -x
if [ "{{ puppet_gem_version }}" != "latest" ]; then if [ "{{ puppet_gem_version }}" != "latest" ]; then
if [ "{{ puppet_gem_version }}" == "5.5" ]; then export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
# Pin to 5.5.6. See PUP-9270 and PUP-9271
export PUPPET_GEM_VERSION='{{ puppet_gem_version }}.6'
else
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0'
fi
fi fi
# TODO(tobias-urdin): Remove when we dont pin rspec-puppet # TODO(tobias-urdin): Remove when we dont pin rspec-puppet
export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}' export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'

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

@ -4,12 +4,7 @@
shell: shell:
cmd: | cmd: |
if [ "{{ puppet_gem_version }}" != "latest" ]; then if [ "{{ puppet_gem_version }}" != "latest" ]; then
if [ "{{ puppet_gem_version }}" == "5.5" ]; then export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
# Pin to 5.5.6. See PUP-9270 and PUP-9271
export PUPPET_GEM_VERSION='{{ puppet_gem_version }}.6'
else
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0'
fi
fi fi
# TODO(tobias-urdin): Remove when we dont pin rspec-puppet # TODO(tobias-urdin): Remove when we dont pin rspec-puppet
export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}' export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'