From da9ce1c1e855adf589d51837e2a6d0c4899b8a18 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 26 Jun 2015 17:00:25 -0400 Subject: [PATCH] puppet/upgrade: do not reinstall Puppet In Trusty: beaker is running dpkg with '--force' option so even if Puppet is already installed, the return code will be 0. In CentOS: beaker is running 'rpm -ivh' the second time and since the package is already here, the return code will be 1. Beaker does not need to be re-install Puppet during the second provisioning during the upgrade flow. So let's define 'BEAKER_provision' to 'no' so we don't try to install Puppet a second time. Change-Id: I1834269ee852cc9e7b66f00622e041cafaee2251 --- jenkins/jobs/puppet-module-jobs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins/jobs/puppet-module-jobs.yaml b/jenkins/jobs/puppet-module-jobs.yaml index 293f9642eb..40f1b0bcbc 100644 --- a/jenkins/jobs/puppet-module-jobs.yaml +++ b/jenkins/jobs/puppet-module-jobs.yaml @@ -94,6 +94,7 @@ bundle install export BEAKER_set=nodepool-{ostype} export BEAKER_debug=yes + export BEAKER_provision=no bundle exec rspec spec/acceptance wrappers: