openstack/puppet-openstack-integration
Code Issues Proposed changes

Pin puppet 5 to 5.5.6

Browse Source 
See PUP-9270 and PUP-9271 for context.

http://lists.openstack.org/pipermail/openstack-dev/2018-October/136102.html

Change-Id: I10fc5e213713503cf24909c79adf979b6e948366
Related-Bug: #1799757
Related-Bug: #1799786
This commit is contained in:
Alex Schultz
2018-10-26 12:51:31 -06:00
parent 770cded75e
commit 09128ebe39
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,12 @@
set -e set -e
set -x set -x
if [ "{{ puppet_gem_version }}" != "latest" ]; then if [ "{{ puppet_gem_version }}" != "latest" ]; then
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0' if [ "{{ puppet_gem_version }}" == "5.5" ]; then
# 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
./run_unit_tests.sh ./run_unit_tests.sh
executable: /bin/bash executable: /bin/bash

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

@@ -3,7 +3,12 @@
- shell: - shell:
cmd: | cmd: |
if [ "{{ puppet_gem_version }}" != "latest" ]; then if [ "{{ puppet_gem_version }}" != "latest" ]; then
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0' if [ "{{ puppet_gem_version }}" == "5.5" ]; then
# 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
mkdir .bundled_gems mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems export GEM_HOME=`pwd`/.bundled_gems