Merge "puppet-beaker tests: don't use puppet 4"
This commit is contained in:
commit
70dfeb840f
|
@ -122,12 +122,7 @@
|
|||
export BEAKER_set=nodepool-centos7
|
||||
export BEAKER_debug=yes
|
||||
export BEAKER_color=no
|
||||
# deploy puppet4 on experimental beaker jobs
|
||||
# https://tickets.puppetlabs.com/browse/BKR-821
|
||||
if [ "centos-7" == "ubuntu-xenial" ]; then
|
||||
export PUPPET_INSTALL_TYPE=agent
|
||||
export PUPPET_MAJ_VERSION=4
|
||||
fi
|
||||
$GEM_HOME/bin/bundle exec rspec spec/acceptance
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
|
|
@ -122,12 +122,7 @@
|
|||
export BEAKER_set=nodepool-trusty
|
||||
export BEAKER_debug=yes
|
||||
export BEAKER_color=no
|
||||
# deploy puppet4 on experimental beaker jobs
|
||||
# https://tickets.puppetlabs.com/browse/BKR-821
|
||||
if [ "ubuntu-trusty" == "ubuntu-xenial" ]; then
|
||||
export PUPPET_INSTALL_TYPE=agent
|
||||
export PUPPET_MAJ_VERSION=4
|
||||
fi
|
||||
$GEM_HOME/bin/bundle exec rspec spec/acceptance
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
|
|
@ -122,12 +122,7 @@
|
|||
export BEAKER_set=nodepool-xenial
|
||||
export BEAKER_debug=yes
|
||||
export BEAKER_color=no
|
||||
# deploy puppet4 on experimental beaker jobs
|
||||
# https://tickets.puppetlabs.com/browse/BKR-821
|
||||
if [ "ubuntu-xenial" == "ubuntu-xenial" ]; then
|
||||
export PUPPET_INSTALL_TYPE=agent
|
||||
export PUPPET_MAJ_VERSION=4
|
||||
fi
|
||||
$GEM_HOME/bin/bundle exec rspec spec/acceptance
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
executable: /bin/bash
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
|
|
@ -122,12 +122,7 @@
|
|||
export BEAKER_set=nodepool-xenial
|
||||
export BEAKER_debug=yes
|
||||
export BEAKER_color=no
|
||||
# deploy puppet4 on experimental beaker jobs
|
||||
# https://tickets.puppetlabs.com/browse/BKR-821
|
||||
if [ "ubuntu-xenial" == "ubuntu-xenial" ]; then
|
||||
export PUPPET_INSTALL_TYPE=agent
|
||||
export PUPPET_MAJ_VERSION=4
|
||||
fi
|
||||
$GEM_HOME/bin/bundle exec rspec spec/acceptance
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
|
|
@ -123,12 +123,7 @@
|
|||
export BEAKER_set=nodepool-centos7
|
||||
export BEAKER_debug=yes
|
||||
export BEAKER_color=no
|
||||
# deploy puppet4 on experimental beaker jobs
|
||||
# https://tickets.puppetlabs.com/browse/BKR-821
|
||||
if [ "centos-7" == "ubuntu-xenial" ]; then
|
||||
export PUPPET_INSTALL_TYPE=agent
|
||||
export PUPPET_MAJ_VERSION=4
|
||||
fi
|
||||
$GEM_HOME/bin/bundle exec rspec spec/acceptance
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
|
|
@ -123,12 +123,7 @@
|
|||
export BEAKER_set=nodepool-trusty
|
||||
export BEAKER_debug=yes
|
||||
export BEAKER_color=no
|
||||
# deploy puppet4 on experimental beaker jobs
|
||||
# https://tickets.puppetlabs.com/browse/BKR-821
|
||||
if [ "ubuntu-trusty" == "ubuntu-xenial" ]; then
|
||||
export PUPPET_INSTALL_TYPE=agent
|
||||
export PUPPET_MAJ_VERSION=4
|
||||
fi
|
||||
$GEM_HOME/bin/bundle exec rspec spec/acceptance
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
|
|
@ -123,12 +123,7 @@
|
|||
export BEAKER_set=nodepool-xenial
|
||||
export BEAKER_debug=yes
|
||||
export BEAKER_color=no
|
||||
# deploy puppet4 on experimental beaker jobs
|
||||
# https://tickets.puppetlabs.com/browse/BKR-821
|
||||
if [ "ubuntu-xenial" == "ubuntu-xenial" ]; then
|
||||
export PUPPET_INSTALL_TYPE=agent
|
||||
export PUPPET_MAJ_VERSION=4
|
||||
fi
|
||||
$GEM_HOME/bin/bundle exec rspec spec/acceptance
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
|
Loading…
Reference in New Issue