openstack/openstack-zuul-jobs
Code Issues Proposed changes

puppet-beaker tests: don't use puppet 4

Browse Source 
The original job code was doing a "if {node} == ubuntu-xenial".  This
got expanded out by the autoconversion, but because it uses "==" with
"[" and runs under POSIX shell (rather than bash) this just ends up as
a syntax error.

Since the test is a no-op in most cases, remove it to avoid the error.
Also use /bin/bash for the cmd for sanity.

This also makes the Xenial tests just use puppet3, which is the puppet
included with Xenial.  This is becoming an issue because infra is
updating to Xenial nodes now, so we are using this against some of our
puppet modules, but only targetting puppet3.

Change-Id: I2355cf58c899bf5f78173b2ed9da26548a9592d0
This commit is contained in:
Ian Wienand 2017-12-14 10:53:45 +11:00
parent 3eb3a03448
commit 9eca8408ae
7 changed files with 7 additions and 42 deletions
playbooks/legacy
puppet-beaker-rspec-centos-7
run.yaml
puppet-beaker-rspec-ubuntu-trusty
run.yaml
puppet-beaker-rspec
run.yaml
puppet-murano-puppet-beaker-rspec
run.yaml
puppet-openstackci-puppet-beaker-rspec-centos-7
run.yaml
puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty
run.yaml
puppet-openstackci-puppet-beaker-rspec
run.yaml

7
playbooks/legacy/puppet-beaker-rspec-centos-7/run.yaml

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

7
playbooks/legacy/puppet-beaker-rspec-ubuntu-trusty/run.yaml

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

7
playbooks/legacy/puppet-beaker-rspec/run.yaml

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

7
playbooks/legacy/puppet-murano-puppet-beaker-rspec/run.yaml

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

7
playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-centos-7/run.yaml

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

7
playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty/run.yaml

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

7
playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run.yaml

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