openstack/puppet-openstack-integration
Code Issues Proposed changes

Support puppet 4.8 and latest for libraries unit test

Browse Source 
Change-Id: Ie70af6ee60efee8d0fd7e81bcc2b84b8dd83b206
This commit is contained in:
ZhongShengping
2018-03-27 15:52:33 +08:00
parent 9474d6c42c
commit 36b6794f3a
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.zuul.yaml
View File

@@ -514,6 +514,20 @@
- ^releasenotes/.*$ - ^releasenotes/.*$
- ^test-requirements.txt$ - ^test-requirements.txt$
- job:
name: puppet-openstack-libraries-puppet-unit-4.8-centos-7
parent: puppet-openstack-libraries-puppet-unit-centos-7
vars:
puppet_gem_version: 4.8
- job:
name: puppet-openstack-libraries-puppet-unit-latest-centos-7
parent: puppet-openstack-libraries-puppet-unit-centos-7
branches: ^master
voting: false
vars:
puppet_gem_version: latest
- project-template: - project-template:
name: puppet-openstack-library-jobs name: puppet-openstack-library-jobs
check: check:
@@ -521,12 +535,14 @@
- puppet-openstack-libraries-puppet-lint-centos-7 - puppet-openstack-libraries-puppet-lint-centos-7
- puppet-openstack-libraries-puppet-syntax-3-centos-7 - puppet-openstack-libraries-puppet-syntax-3-centos-7
- puppet-openstack-libraries-puppet-syntax-4-centos-7 - puppet-openstack-libraries-puppet-syntax-4-centos-7
- puppet-openstack-libraries-puppet-unit-centos-7 - puppet-openstack-libraries-puppet-unit-4.8-centos-7
- puppet-openstack-libraries-puppet-unit-latest-centos-7
- puppet-openstack-libraries-puppet-beaker-rspec-centos-7 - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
gate: gate:
jobs: jobs:
- puppet-openstack-libraries-puppet-lint-centos-7 - puppet-openstack-libraries-puppet-lint-centos-7
- puppet-openstack-libraries-puppet-syntax-3-centos-7 - puppet-openstack-libraries-puppet-syntax-3-centos-7
- puppet-openstack-libraries-puppet-syntax-4-centos-7 - puppet-openstack-libraries-puppet-syntax-4-centos-7
- puppet-openstack-libraries-puppet-unit-centos-7 - puppet-openstack-libraries-puppet-unit-4.8-centos-7
- puppet-openstack-libraries-puppet-unit-latest-centos-7
- puppet-openstack-libraries-puppet-beaker-rspec-centos-7 - puppet-openstack-libraries-puppet-beaker-rspec-centos-7

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

@@ -4,6 +4,9 @@
cmd: | cmd: |
set -e set -e
set -x set -x
if [ "{{ puppet_gem_version }}" != "latest" ]; then
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0'
fi
./run_unit_tests.sh ./run_unit_tests.sh
executable: /bin/bash executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace' chdir: '{{ ansible_user_dir }}/workspace'