Set selective rspec-puppet versions
We set the 2.7.1 rspec-puppet version on the latest non-voting job so that we can start working on supporting this latest version were strict variables is enabled. Since our spec testing does not include classes in pre_condition properly it fails in later rspec-puppet versions. This still leaves our voting jobs with the 2.3.0 versions so that they dont fail. Change-Id: I7f589d931a948dd9de2100d55f98b95675956768
This commit is contained in:
parent
c9a8bc4f66
commit
d12671bc28
@ -12,6 +12,8 @@
|
|||||||
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0'
|
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0'
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
# TODO(tobias-urdin): Remove when we dont pin rspec-puppet
|
||||||
|
export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
|
||||||
./run_unit_tests.sh
|
./run_unit_tests.sh
|
||||||
executable: /bin/bash
|
executable: /bin/bash
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
chdir: '{{ ansible_user_dir }}/workspace'
|
||||||
|
@ -11,6 +11,8 @@
|
|||||||
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0'
|
export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0'
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
# TODO(tobias-urdin): Remove when we dont pin rspec-puppet
|
||||||
|
export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
|
||||||
mkdir .bundled_gems
|
mkdir .bundled_gems
|
||||||
export GEM_HOME=`pwd`/.bundled_gems
|
export GEM_HOME=`pwd`/.bundled_gems
|
||||||
ruby <<EOF
|
ruby <<EOF
|
||||||
|
@ -126,6 +126,9 @@
|
|||||||
- ^.gitignore$
|
- ^.gitignore$
|
||||||
- ^setup.cfg$
|
- ^setup.cfg$
|
||||||
- ^setup.py$
|
- ^setup.py$
|
||||||
|
# TODO(tobias-urdin): Remove when we use rspec-puppet 2.7.1
|
||||||
|
vars:
|
||||||
|
rspec_puppet_version: '~> 2.3.0'
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-libraries-puppet-unit-base
|
name: puppet-openstack-libraries-puppet-unit-base
|
||||||
@ -145,6 +148,9 @@
|
|||||||
- ^.gitignore$
|
- ^.gitignore$
|
||||||
- ^setup.cfg$
|
- ^setup.cfg$
|
||||||
- ^setup.py$
|
- ^setup.py$
|
||||||
|
# TODO(tobias-urdin): Remove when we use rspec-puppet 2.7.1
|
||||||
|
vars:
|
||||||
|
rspec_puppet_version: '~> 2.3.0'
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-beaker-run-base
|
name: puppet-openstack-beaker-run-base
|
||||||
|
@ -32,3 +32,6 @@
|
|||||||
voting: false
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
puppet_gem_version: latest
|
puppet_gem_version: latest
|
||||||
|
# TODO(tobias-urdin): Remove this when we 2.7.1 works without
|
||||||
|
# any issues and we can leave it not pinned to anything.
|
||||||
|
rspec_puppet_version: '= 2.7.1'
|
||||||
|
@ -31,7 +31,9 @@
|
|||||||
voting: false
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
puppet_gem_version: latest
|
puppet_gem_version: latest
|
||||||
|
# TODO(tobias-urdin): Remove this when we 2.7.1 works without
|
||||||
|
# any issues and we can leave it not pinned to anything.
|
||||||
|
rspec_puppet_version: '= 2.7.1'
|
||||||
|
|
||||||
- project-template:
|
- project-template:
|
||||||
name: puppet-openstack-module-unit-jobs
|
name: puppet-openstack-module-unit-jobs
|
||||||
|
Loading…
x
Reference in New Issue
Block a user