Merge "Ensure we fail packer jobs if any step fails"

[releng/builder.git] / packer / provision / java-builder.sh

diff --git a/packer/provision/java-builder.sh b/packer/provision/java-builder.sh
index ad0ef81e2e242142bc3c5b0475ab17fc02df7f9a..6f8f6121b8380a7d04ed80151d2c8c13b911bc76 100644 (file)
--- a/packer/provision/java-builder.sh
+++ b/packer/provision/java-builder.sh
@@ -12,16 +12,6 @@ yum install -y @development perl-{Digest-SHA,ExtUtils-MakeMaker} \
     {readline,unixODBC}-devel yum-utils fedora-packager \
     libxslt-devel crudini
 
-# Install python3 and dependencies, needed for Coala linting at least
-yum install -y python34
-yum install -y python34-{devel,virtualenv,setuptools,pip}
-
-# Install python dependencies, useful generally
-yum install -y python-{devel,virtualenv,setuptools,pip}
-
-# Use pip to install newer version of git-review
-pip install git-review --upgrade
-
 # Needed by autorelease scripts
 yum install -y xmlstarlet
 
@@ -31,14 +21,12 @@ yum install -y graphviz
 # Needed by deploy test
 yum install -y sshpass
 
-# tcpmd5 is wanting to do 32bit ARM cross-compilation and is specifically
-# requesting the following be installed (note the kernel headers are
-# going to be the x86_64 package as there aren't separate 32bit and
-# x86_64 packages for them
-yum install -y glibc-devel.i686 kernel-headers
+#########################
+# Integration/Packaging #
+#########################
 
-# Needed by opendove
-yum install -y {jansson,libevent,libnl,libuuid}-devel
+# Install software for building RPMs
+yum install -y fedora-packager
 
 # Needed for vsemprovider build in vtn project to enable C# compilation.
 rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
@@ -76,15 +64,3 @@ unzip packer_0.12.2_linux_amd64.zip -d /usr/local/bin/
 # rename packer to avoid conflict with binary in cracklib
 mv /usr/local/bin/packer /usr/local/bin/packer.io
 
-#Check out 6Wind quagga with tag name '20170418', compile and install for router functionalities
-echo "---> Installing the Quagga..."
-mkdir -p /tmp/build_quagga
-cd /tmp/build_quagga
-git clone https://github.com/6WIND/zrpcd.git
-cd zrpcd
-git checkout 20170418
-chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t -v 2
-
-# Removing the build_quagga folder
-rm -rf /tmp/build_quagga/