aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2016-12-05 16:53:37 +0200
committerFathi Boudra <fathi.boudra@linaro.org>2016-12-05 14:55:31 +0000
commit648a048b93632585e77d0ea232e11b4884fa7bfe (patch)
treefe1b5383b1941d5f606f92ff5cc0f74c341890f5
parent23a390be7557a6cdd926e9d34eec5f9fe82a8a36 (diff)
downloadconfigs-648a048b93632585e77d0ea232e11b4884fa7bfe.tar.gz
odpi-bigtop: use distro supplied java-1.8.0-openjdk
Change-Id: If0236a11199a5b231e61d036d449cf475d4a7773 Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-rw-r--r--odpi-bigtop-hadoop-rpm.yaml3
-rw-r--r--odpi-bigtop-hive-rpm.yaml3
-rwxr-xr-xodpi-bigtop-rpm/common/builders.sh17
-rw-r--r--odpi-bigtop-spark-rpm.yaml3
4 files changed, 4 insertions, 22 deletions
diff --git a/odpi-bigtop-hadoop-rpm.yaml b/odpi-bigtop-hadoop-rpm.yaml
index 7215e917d..42c1e0a50 100644
--- a/odpi-bigtop-hadoop-rpm.yaml
+++ b/odpi-bigtop-hadoop-rpm.yaml
@@ -24,9 +24,6 @@
name: MAVEN_OPTS
default: '-Xmx8G -XX:MaxPermSize=1G'
- string:
- name: JDK_URL
- default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1609.tar.xz'
- - string:
name: MAVEN_URL
default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
- string:
diff --git a/odpi-bigtop-hive-rpm.yaml b/odpi-bigtop-hive-rpm.yaml
index 1429da646..ea7d2979c 100644
--- a/odpi-bigtop-hive-rpm.yaml
+++ b/odpi-bigtop-hive-rpm.yaml
@@ -24,9 +24,6 @@
name: MAVEN_OPTS
default: '-Xmx8G -XX:MaxPermSize=1G'
- string:
- name: JDK_URL
- default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1609.tar.xz'
- - string:
name: MAVEN_URL
default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
- string:
diff --git a/odpi-bigtop-rpm/common/builders.sh b/odpi-bigtop-rpm/common/builders.sh
index 24e07d134..ead685736 100755
--- a/odpi-bigtop-rpm/common/builders.sh
+++ b/odpi-bigtop-rpm/common/builders.sh
@@ -28,6 +28,7 @@ sudo yum install -y \
lzo-devel \
make \
mariadb-devel \
+ java-1.8.0-openjdk \
openldap-devel \
openssl-devel \
pkgconfig \
@@ -43,23 +44,13 @@ sudo yum install -y \
wget \
xmlto
-# download OpenJDK and Maven explicitely
-wget --progress=dot -e dotbytes=2M ${JDK_URL} ${MAVEN_URL} ${SCALA_URL} ${NODE_URL} ${PROTOBUF_URL}
-tar -Jxf jdk*.tar.xz
+# download some dependencies explicitely
+wget --progress=dot -e dotbytes=2M ${MAVEN_URL} ${SCALA_URL} ${NODE_URL} ${PROTOBUF_URL}
tar -zxf apache-maven-*.tar.gz
tar -zxf scala-*.tgz
tar -zxf node-*.tar.gz
tar -zxf protobuf-*.tar.gz
-# replace cacerts with distro-supplied
-cd jdk*/jre/lib/security/
-rm -f cacerts
-ln -s /etc/pki/java/cacerts
-
-# set JAVA_HOME
-cd ${WORKSPACE}/jdk*
-export JAVA_HOME=${PWD}
-
# set M3_HOME
cd ${WORKSPACE}/apache-maven-*
export M3_HOME=${PWD}
@@ -75,7 +66,7 @@ cd ${WORKSPACE}/scala-*
export SCALA_HOME=${PWD}
# set PATH
-export PATH=${JAVA_HOME}/bin:${M3_HOME}/bin:${PATH}
+export PATH=${M3_HOME}/bin:${PATH}
java -version
mvn -version
diff --git a/odpi-bigtop-spark-rpm.yaml b/odpi-bigtop-spark-rpm.yaml
index 6901c7cf4..723a0fa90 100644
--- a/odpi-bigtop-spark-rpm.yaml
+++ b/odpi-bigtop-spark-rpm.yaml
@@ -24,9 +24,6 @@
name: MAVEN_OPTS
default: '-Xmx8G -XX:MaxPermSize=1G'
- string:
- name: JDK_URL
- default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1609.tar.xz'
- - string:
name: MAVEN_URL
default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
- string: