Merge "puppet-beaker tests: don't use puppet 4"

This commit is contained in:
Zuul 2017-12-14 21:37:52 +00:00 committed by Gerrit Code Review
commit 70dfeb840f
7 changed files with 7 additions and 42 deletions

View File

@ -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 }}'

View File

@ -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 }}'

View File

@ -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 }}'

View File

@ -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 }}'

View File

@ -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 }}'

View File

@ -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 }}'

View File

@ -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 }}'