BIGTOP-2191: openjdk-7 is missing in bigtop/slave:ubuntu-14.04-ppc64le docker 
image


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c78e635a
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c78e635a
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c78e635a

Branch: refs/heads/master
Commit: c78e635aea166e653b95f07bfd6d1c9b976e0a09
Parents: 48c02c4
Author: Olaf Flebbe <[email protected]>
Authored: Tue Dec 29 21:44:54 2015 +0100
Committer: Olaf Flebbe <[email protected]>
Committed: Wed Dec 30 10:45:50 2015 +0100

----------------------------------------------------------------------
 bigtop_toolchain/bin/puppetize.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/c78e635a/bigtop_toolchain/bin/puppetize.sh
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/bin/puppetize.sh 
b/bigtop_toolchain/bin/puppetize.sh
index 6facf14..de02db4 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -39,11 +39,13 @@ case ${ID}-${VERSION_ID} in
        yum -y install hostname curl sudo unzip wget puppet
        ;;
     ubuntu-14.04)
-       # BIGTOP-2003. A workaround to install newer hiera to get rid of hiera 
1.3.0 bug.
        apt-get -y install wget
-       wget -O /tmp/puppetlabs-release-trusty.deb 
https://apt.puppetlabs.com/puppetlabs-release-trusty.deb && dpkg -i 
/tmp/puppetlabs-release-trusty.deb
-       rm -f /tmp/puppetlabs-release-trusty.deb
-       apt-get update
+       if [ $HOSTTYPE = "x86_64" ] ; then
+         # BIGTOP-2003. A workaround to install newer hiera to get rid of 
hiera 1.3.0 bug.
+         wget -O /tmp/puppetlabs-release-trusty.deb 
https://apt.puppetlabs.com/puppetlabs-release-trusty.deb && dpkg -i 
/tmp/puppetlabs-release-trusty.deb
+         rm -f /tmp/puppetlabs-release-trusty.deb
+         apt-get update
+        fi
        apt-get -y install curl sudo unzip puppet software-properties-common
        ;;
     ubuntu-15*)

Reply via email to