openstack/puppet-openstack-integration
Code Issues Proposed changes

Unpin puppet gem version selection

Browse Source 
The tickets PUP-9270 [1] and PUP-9271 [2]
is fixed and we should unpin so we use the
latest puppet 5.5 version.

Also changes so that we check that the
templated var puppet_gem_version is actually
containing a value and not just empty if so
we can skip setting the environment variable
and just have the gem unpinned in the spec
helper.

[1] https://tickets.puppetlabs.com/browse/PUP-9270
[2] https://tickets.puppetlabs.com/browse/MODULES-8193

Change-Id: I9b0dbc704638097fc0f6e3702fcea04fb8541b02
This commit is contained in:
Tobias Urdin 2019-01-25 09:55:17 +01:00
parent 6ea5581a38
commit 3baa922ab5
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
./run_unit_tests.sh ./run_unit_tests.sh
executable: /bin/bash executable: /bin/bash

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
mkdir .bundled_gems mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems export GEM_HOME=`pwd`/.bundled_gems