From 3b822a201fa071ed9c600b09566bea8847287782 Mon Sep 17 00:00:00 2001
From: Ganesh Raju <ganesh.raju@linaro.org>
Date: Tue, 25 Jul 2017 12:46:36 +0100
Subject: Merge branch 'erp17.08' of
 ssh://git.linaro.org/leg/bigdata/bigtop-trunk

---
 bigtop-tests/test-artifacts/spark/pom.xml          |  3 +-
 docker/bigtop-puppet/debian-8-aarch64/puppetize.sh | 88 ++++++++++++++++++++++
 docker/pseudo-cluster/config/hieradata/site.yaml   |  1 +
 docker/sandbox/site.yaml.template.debian-8_hadoop  |  1 +
 4 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100755 docker/bigtop-puppet/debian-8-aarch64/puppetize.sh

diff --git a/bigtop-tests/test-artifacts/spark/pom.xml b/bigtop-tests/test-artifacts/spark/pom.xml
index ae522668..ab59376f 100644
--- a/bigtop-tests/test-artifacts/spark/pom.xml
+++ b/bigtop-tests/test-artifacts/spark/pom.xml
@@ -28,8 +28,7 @@
   </parent>
 
   <groupId>org.apache.bigtop.itest</groupId>
-  <artifactId>spark-smoke</artifactId>
-  <version>1.2.1</version>
+  <version>1.3.0-SNAPSHOT</version>
   <name>sparksmoke</name>
 
   <repositories>
diff --git a/docker/bigtop-puppet/debian-8-aarch64/puppetize.sh b/docker/bigtop-puppet/debian-8-aarch64/puppetize.sh
new file mode 100755
index 00000000..6147a581
--- /dev/null
+++ b/docker/bigtop-puppet/debian-8-aarch64/puppetize.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Use /etc/os-release to determine Linux Distro
+
+if [ -f /etc/os-release ]; then
+    . /etc/os-release
+else
+    if [ -f /etc/redhat-release ]; then
+	if grep "CentOS release 6" /etc/redhat-release >/dev/null ; then
+	    ID=centos
+	    VERSION_ID=6
+	fi
+    else
+	echo "Unknown Linux Distribution."
+	exit 1
+    fi
+fi
+
+case ${ID}-${VERSION_ID} in
+    fedora-25*)
+        dnf -y install yum-utils
+        dnf -y update 
+        dnf -y install hostname findutils curl sudo unzip wget puppet
+        ;;
+    ubuntu-14.04)
+	apt-get update
+	apt-get -y install wget
+	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-*)
+	apt-get update
+	apt-get -y install curl sudo unzip wget puppet software-properties-common
+	;;
+    debian-8*)
+	apt-get update
+	apt-get -y install wget
+	# BIGTOP-2523. in order to install puppet 3.8 we need to get it from puppet repo
+	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
+	apt-get -y install curl sudo unzip puppet
+	;;
+    opensuse-*)
+	zypper --gpg-auto-import-keys install -y curl sudo unzip wget puppet suse-release ca-certificates-mozilla net-tools tar
+	;;
+    centos-6*)
+        rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm
+	yum -y install curl sudo unzip wget puppet tar
+	;;
+    centos-7*)
+        rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm
+	yum -y install hostname curl sudo unzip wget puppet
+	;;
+    *)
+	echo "Unsupported OS ${ID}-${VERSION_ID}."
+	exit 1
+esac
+
+puppet module install puppetlabs-stdlib
+
+case ${ID} in
+   debian|ubuntu)
+       version=""
+       if [ `puppet --version | cut -c1` -lt "4" ]; then
+           version="--version 2.4.0"
+       fi
+      puppet module install puppetlabs-apt $version;;
+esac
diff --git a/docker/pseudo-cluster/config/hieradata/site.yaml b/docker/pseudo-cluster/config/hieradata/site.yaml
index 4c56bf5c..c0000719 100644
--- a/docker/pseudo-cluster/config/hieradata/site.yaml
+++ b/docker/pseudo-cluster/config/hieradata/site.yaml
@@ -8,3 +8,4 @@ hadoop_cluster_node::cluster_components:
   - mapreduce
 bigtop::bigtop_repo_uri: http://bigtop-repos.s3.amazonaws.com/releases/1.2.1/ubuntu/16.04/x86_64
 
+
diff --git a/docker/sandbox/site.yaml.template.debian-8_hadoop b/docker/sandbox/site.yaml.template.debian-8_hadoop
index a8d7f157..87a0f195 100644
--- a/docker/sandbox/site.yaml.template.debian-8_hadoop
+++ b/docker/sandbox/site.yaml.template.debian-8_hadoop
@@ -17,3 +17,4 @@ bigtop::hadoop_head_node: "head.node.fqdn"
 hadoop::hadoop_storage_dirs: [/data/1, /data/2]
 bigtop::bigtop_repo_uri: http://bigtop-repos.s3.amazonaws.com/releases/1.2.1/debian/8/x86_64
 hadoop_cluster_node::cluster_components: [hdfs, yarn, mapred-app]
+
-- 
cgit v1.2.3