openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Make beaker tests honour puppet_gem_version"

Browse Source
This commit is contained in:
Zuul 2019-01-25 20:03:22 +00:00 committed by Gerrit Code Review
commit 01b16930e2
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/run-beaker-tests.yaml
View File

@ -25,6 +25,9 @@
shell:
cmd: |
trap "{{ ansible_user_dir }}/workspace/openstack/puppet-openstack-integration/copy_logs.sh" EXIT
if [ "{{ puppet_gem_version }}" != "latest" ]; then
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
fi
export BEAKER_PUPPET_COLLECTION=puppet5
export BEAKER_set=nodepool-{{ nodepool_type }}
export BEAKER_debug=yes

3
playbooks/run-libraries-beaker-tests.yaml
View File

@ -25,6 +25,9 @@
set -e
set -x
trap "{{ ansible_user_dir }}/workspace/openstack/puppet-openstack-integration/copy_logs.sh" EXIT
if [ "{{ puppet_gem_version }}" != "latest" ]; then
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
fi
export BEAKER_PUPPET_COLLECTION=puppet5
export BEAKER_set=nodepool-{{ nodepool_type }}
./run_beaker_tests.sh

1
zuul.d/base.yaml
View File

@ -184,3 +184,4 @@
voting: false
vars:
nodepool_type: bionic
puppet_gem_version: latest

1
zuul.d/beaker.yaml
View File

@ -51,3 +51,4 @@
- ^.gitignore$
vars:
nodepool_type: bionic
puppet_gem_version: latest