Make packer templates fail on any problems
Make packer templates fail on any problems and to not be quiet in their
builds.
Change-Id: Ieb1ef5f6f2bff711597bd7464a2676520e5fc0d8
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 4870cbf..923a196 100644
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -2,6 +2,9 @@
# vim: ts=4 sw=4 sts=4 et tw=72 :
+# force any errors to cause the script and job to end in failure
+set -xeu -o pipefile
+
rh_systems() {
# Handle the occurance where SELINUX is actually disabled
SELINUX=$(grep -E '^SELINUX=(disabled|permissive|enforcing)$' /etc/selinux/config)
@@ -39,24 +42,24 @@
esac
echo "---> Updating operating system"
- yum clean all -q
- yum install -y -q deltarpm
- yum update -y -q
+ yum clean all
+ yum install -y deltarpm
+ yum update -y
# add in components we need or want on systems
echo "---> Installing base packages"
- yum install -y -q @base https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+ yum install -y @base https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
# separate group installs from package installs since a non-existing
# group with dnf based systems (F21+) will fail the install if such
# a group does not exist
- yum install -y -q unzip xz puppet git git-review perl-XML-XPath wget make
+ yum install -y unzip xz puppet git git-review perl-XML-XPath wget make
# All of our systems require Java (because of Jenkins)
# Install all versions of the OpenJDK devel but force 1.7.0 to be the
# default
echo "---> Configuring OpenJDK"
- yum install -y -q 'java-*-openjdk-devel'
+ yum install -y 'java-*-openjdk-devel'
FACTER_OS=$(/usr/bin/facter operatingsystem)
FACTER_OSVER=$(/usr/bin/facter operatingsystemrelease)
@@ -70,6 +73,15 @@
alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
fi
;;
+ RedHat,CentOS)
+ if [ "$(echo $FACTER_OSVER | cut -d'.' -f1)" -ge "7" ]
+ then
+ echo "---> not modifying java alternatives as OpenJDK 1.7.0 does not exist"
+ else
+ alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
+ alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
+ fi
+ ;;
*)
alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
@@ -104,22 +116,22 @@
EOF
echo "---> Updating operating system"
- apt-get update -qq > /dev/null
- apt-get upgrade -qq > /dev/null
+ apt-get update > /dev/null
+ apt-get upgrade > /dev/null
# add in stuff we know we need
echo "---> Installing base packages"
- apt-get install -qq unzip xz-utils puppet git git-review libxml-xpath-perl make wget > /dev/null
+ apt-get install unzip xz-utils puppet git git-review libxml-xpath-perl make wget > /dev/null
# install Java 7
echo "---> Configuring OpenJDK"
- apt-get install -qq openjdk-7-jdk > /dev/null
+ apt-get install openjdk-7-jdk > /dev/null
# make jdk8 available
add-apt-repository -y ppa:openjdk-r/ppa > /dev/null
- apt-get update -qq > /dev/null
+ apt-get update > /dev/null
# We need to force openjdk-8-jdk to install
- apt-get install -qq openjdk-8-jdk > /dev/null
+ apt-get install openjdk-8-jdk > /dev/null
# make sure that we still default to openjdk 7
update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
@@ -127,7 +139,7 @@
# Needed to parse OpenStack commands used by infra stack commands
# to initialize Heat template based systems.
- apt-get install -qq jq > /dev/null
+ apt-get install jq > /dev/null
# disable unattended upgrades & daily updates
echo '---> Disabling automatic daily upgrades'