Bake fedora-packager into java-builder image

Make the image boot a little more quickly by baking it into
java-builder packer build.

Change-Id: Ia002c6327a676021198199ea054ff3f62abf2553
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jenkins-scripts/builder.sh b/jenkins-scripts/builder.sh
index 7bf52da37ce117dbb472404d524dbb2348939175..367451f56e414ca0b3d74c26a7a20aae185071f8 100755 (executable)
--- a/jenkins-scripts/builder.sh
+++ b/jenkins-scripts/builder.sh
@@ -3,13 +3,6 @@
 
 yum clean all
 
-#
-# Integration/Packaging
-#
-
-# Install software for building RPMs
-yum install -y fedora-packager
-
 # disable the firewall
 /bin/bash ./disable_firewall.sh
 

diff --git a/packer/provision/java-builder.sh b/packer/provision/java-builder.sh
index 57bcc1227314ab732de45b042158ae1d1377824c..a54dceeee142ab589067ad711647716b03466d56 100644 (file)
--- a/packer/provision/java-builder.sh
+++ b/packer/provision/java-builder.sh
@@ -28,6 +28,13 @@ yum install -y graphviz
 # Needed by deploy test
 yum install -y sshpass
 
+#########################
+# Integration/Packaging #
+#########################
+
+# Install software for building RPMs
+yum install -y fedora-packager
+
 # 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