From 379f14bfc2c5944ffbc4bef44e6a08dd564d1920 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 2 Nov 2015 15:16:01 -0500 Subject: [PATCH] macros/puppet-prepare-node: drop rdo-release When running Puppet jobs, RDO repository is managed by Puppet. If rdo-release package is installed, we will always install Liberty (latest rdo-release package) and we don't want that. Puppet CI is currently deploying Liberty in stable/kilo jobs, because of this package. We need to drop this package before any Puppet related job, so we make sure Puppet manifests will manage the repositories that we actually want. Change-Id: I3173e850dfdf43b868e4a180083c19c3cbe30ff3 --- jenkins/jobs/macros.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml index 0f9fddafd8..be7404d6a2 100644 --- a/jenkins/jobs/macros.yaml +++ b/jenkins/jobs/macros.yaml @@ -241,7 +241,7 @@ builders: - shell: | if [ -f /usr/bin/yum ]; then - sudo yum -y remove facter puppet + sudo yum -y remove facter puppet rdo-release sudo yum -y install libxml2-devel libxslt-devel ruby-devel sudo yum -y groupinstall "Development Tools" elif [ -f /usr/bin/apt-get ]; then