Merge "Jenkins job to build MSB API Gateway docker"

[ci-management.git] / packer / provision / baseline.sh

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 923a196..d97f0e2 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -3,7 +3,7 @@
 # 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
+set -xeu -o pipefail
 
 rh_systems() {
     # Handle the occurance where SELINUX is actually disabled
@@ -73,7 +73,7 @@ rh_systems() {
                 alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
             fi
         ;;
-        RedHat,CentOS)
+        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"
@@ -116,35 +116,61 @@ Dpkg::Options {
 EOF
 
     echo "---> Updating operating system"
-    apt-get update > /dev/null
-    apt-get upgrade > /dev/null
+    apt-get update
+    apt-get upgrade
 
     # add in stuff we know we need
     echo "---> Installing base packages"
-    apt-get install 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
 
     # install Java 7
     echo "---> Configuring OpenJDK"
-    apt-get install openjdk-7-jdk > /dev/null
+    FACTER_OSVER=$(/usr/bin/facter operatingsystemrelease)
+    case "$FACTER_OSVER" in
+        14.04)
+            apt-get install openjdk-7-jdk
+            # make jdk8 available
+            add-apt-repository -y ppa:openjdk-r/ppa
+            apt-get update
+            # We need to force openjdk-8-jdk to install
+            apt-get install openjdk-8-jdk
+            # make sure that we still default to openjdk 7
+            update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
+            update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/bin/javac
+
+            # disable auto-update service?
+            if [ -f /etc/cron.daily/apt ]
+            then
+                rm -rf /etc/cron.daily/apt
+            fi
+        ;;
+        16.04)
+            apt-get install openjdk-8-jdk
+
+            # force auto-update services off and mask them so they can't
+            # be started
+            for i in apt-daily.{service,timer}
+            do
+                systemctl disable ${i}
+                systemctl mask ${i}
+            done
+        ;;
+        *)
+            echo "---> Unknown Ubuntu version $FACTER_OSVER"
+            exit 1
+        ;;
+    esac
 
-    # make jdk8 available
-    add-apt-repository -y ppa:openjdk-r/ppa > /dev/null
-    apt-get update > /dev/null
-    # We need to force openjdk-8-jdk to install
-    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
-    update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/bin/javac
 
     # Needed to parse OpenStack commands used by infra stack commands
     # to initialize Heat template based systems.
-    apt-get install jq > /dev/null
+    apt-get install jq
 
     # disable unattended upgrades & daily updates
     echo '---> Disabling automatic daily upgrades'
-    sed -ine 's/"1"/"0"/g' /etc/apt/apt.conf.d/10periodic
-    echo 'APT::Periodic::Unattended-Upgrade "0";' >> /etc/apt/apt.conf.d/10periodic
+    grep -lR 'APT::Periodic' /etc/apt/apt.conf.d/ | perl -pi -e 's/"1"/"0"/g'
+
 }
 
 all_systems() {