From d0c95bb6427ae4e764a607505f90a4d65add45e5 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 20 Sep 2017 10:08:38 -0700 Subject: [PATCH] Don't remove puppet in puppet prep macro. We are running into errors when attempting to uninstal hiera on trusty jobs because the hiera package does not exist. We no longer install puppet as part of our image build process so we shouldn't need to uninstall puppet, hiera, and facter at all. Simply drop the the removals to address this as there is nothing to remove any longer. Change-Id: I1ce79f3f7dd164e0635a4ae45210194f50ab8ad9 --- jenkins/jobs/macros.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml index d108b6d05b..4224bc506e 100644 --- a/jenkins/jobs/macros.yaml +++ b/jenkins/jobs/macros.yaml @@ -521,19 +521,15 @@ - shell: | #!/bin/bash -xe if [ -f /usr/bin/yum ]; then - sudo yum -y remove facter puppet hiera rdo-release "centos-release-openstack-*" "centos-release-ceph-*" + sudo yum -y remove rdo-release "centos-release-openstack-*" "centos-release-ceph-*" sudo yum -y install libxml2-devel libxslt-devel ruby-devel zlib-devel sudo yum -y groupinstall "Development Tools" # Uninstall python-requests from pip, since we install it in # system-config/install_puppet.sh sudo pip uninstall requests -y || true elif [ -f /usr/bin/apt-get ]; then - sudo apt-get remove -y --purge facter puppet puppet-common hiera sudo apt-get update sudo apt-get install -y libxml2-dev libxslt-dev ruby-dev zlib1g-dev - # /etc/default/puppet is not purged when removing Puppet - # but need to be dropped if we want to re-install puppet-agent on Xenial - sudo rm -rf /etc/default/puppet fi - builder: