You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2017/03/24 18:28:08 UTC
[1/2] bigtop git commit: BIGTOP-2664. create provisioner test for
trunk packages with jdk8
Repository: bigtop
Updated Branches:
refs/heads/master a05d3813f -> b8959afe6
BIGTOP-2664. create provisioner test for trunk packages with jdk8
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/599207ff
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/599207ff
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/599207ff
Branch: refs/heads/master
Commit: 599207ff8157b56e87f94623277fe345a3af57c7
Parents: a05d381
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Wed Mar 22 14:58:00 2017 -0700
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Fri Mar 24 11:23:46 2017 -0700
----------------------------------------------------------------------
bigtop-bigpetstore/bigpetstore-transaction-queue/Dockerfile | 4 ++--
docker/pseudo-cluster/config/hieradata/site.yaml | 2 +-
docker/sandbox/sandbox-env.sh | 4 ++--
docker/sandbox/site.yaml.template.centos-6_hadoop | 2 +-
docker/sandbox/site.yaml.template.debian-8_hadoop | 2 +-
provisioner/docker/config_centos6.yaml | 2 +-
provisioner/docker/config_centos7.yaml | 2 +-
provisioner/docker/config_debian8.yaml | 2 +-
provisioner/docker/config_ubuntu_trusty.yaml | 2 +-
provisioner/vagrant/vagrantconfig.yaml | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/599207ff/bigtop-bigpetstore/bigpetstore-transaction-queue/Dockerfile
----------------------------------------------------------------------
diff --git a/bigtop-bigpetstore/bigpetstore-transaction-queue/Dockerfile b/bigtop-bigpetstore/bigpetstore-transaction-queue/Dockerfile
index 8ee4416..3f43aa6 100644
--- a/bigtop-bigpetstore/bigpetstore-transaction-queue/Dockerfile
+++ b/bigtop-bigpetstore/bigpetstore-transaction-queue/Dockerfile
@@ -15,8 +15,8 @@
FROM centos:7
MAINTAINER jay@apache.org
RUN yum update -y
-RUN yum install -y java-1.7.0-openjdk unzip wget
-RUN yum install -y java-1.7.0-openjdk-devel
+RUN yum install -y java-1.8.0-openjdk unzip wget
+RUN yum install -y java-1.8.0-openjdk-devel
WORKDIR /opt/
http://git-wip-us.apache.org/repos/asf/bigtop/blob/599207ff/docker/pseudo-cluster/config/hieradata/site.yaml
----------------------------------------------------------------------
diff --git a/docker/pseudo-cluster/config/hieradata/site.yaml b/docker/pseudo-cluster/config/hieradata/site.yaml
index ddf98d3..a8ab29d 100644
--- a/docker/pseudo-cluster/config/hieradata/site.yaml
+++ b/docker/pseudo-cluster/config/hieradata/site.yaml
@@ -6,5 +6,5 @@ hadoop_cluster_node::cluster_components:
- hadoop
- yarn
bigtop::bigtop_repo_uri: http://bigtop-repos.s3.amazonaws.com/releases/1.1.0/ubuntu/trusty/x86_64
-bigtop::jdk_package_name: openjdk-7-jdk
+bigtop::jdk_package_name: openjdk-8-jdk
http://git-wip-us.apache.org/repos/asf/bigtop/blob/599207ff/docker/sandbox/sandbox-env.sh
----------------------------------------------------------------------
diff --git a/docker/sandbox/sandbox-env.sh b/docker/sandbox/sandbox-env.sh
index 6eb5e54..b47d79e 100644
--- a/docker/sandbox/sandbox-env.sh
+++ b/docker/sandbox/sandbox-env.sh
@@ -18,7 +18,7 @@
RPMS=(centos-6 centos-7 fedora-20)
DEBS=(debian-8 ubuntu-14.04)
-RPM_JDK=java-1.7.0-openjdk-devel.x86_64
-DEB_JDK=openjdk-7-jdk
+RPM_JDK=java-1.8.0-openjdk-devel.x86_64
+DEB_JDK=openjdk-8-jdk
BIGTOP_VERSION=1.1.0
http://git-wip-us.apache.org/repos/asf/bigtop/blob/599207ff/docker/sandbox/site.yaml.template.centos-6_hadoop
----------------------------------------------------------------------
diff --git a/docker/sandbox/site.yaml.template.centos-6_hadoop b/docker/sandbox/site.yaml.template.centos-6_hadoop
index 71a7c33..f38c4fb 100644
--- a/docker/sandbox/site.yaml.template.centos-6_hadoop
+++ b/docker/sandbox/site.yaml.template.centos-6_hadoop
@@ -17,4 +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.1.0/centos/6/x86_64
hadoop_cluster_node::cluster_components: [hadoop, yarn]
-bigtop::jdk_package_name: java-1.7.0-openjdk-devel.x86_64
+bigtop::jdk_package_name: java-1.8.0-openjdk-devel.x86_64
http://git-wip-us.apache.org/repos/asf/bigtop/blob/599207ff/docker/sandbox/site.yaml.template.debian-8_hadoop
----------------------------------------------------------------------
diff --git a/docker/sandbox/site.yaml.template.debian-8_hadoop b/docker/sandbox/site.yaml.template.debian-8_hadoop
index f2436ba..9a00c43 100644
--- a/docker/sandbox/site.yaml.template.debian-8_hadoop
+++ b/docker/sandbox/site.yaml.template.debian-8_hadoop
@@ -17,4 +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.1.0/debian/8/x86_64
hadoop_cluster_node::cluster_components: [hadoop, yarn]
-bigtop::jdk_package_name: openjdk-7-jdk
+bigtop::jdk_package_name: openjdk-8-jdk
http://git-wip-us.apache.org/repos/asf/bigtop/blob/599207ff/provisioner/docker/config_centos6.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_centos6.yaml b/provisioner/docker/config_centos6.yaml
index 54ca86c..1f06731 100644
--- a/provisioner/docker/config_centos6.yaml
+++ b/provisioner/docker/config_centos6.yaml
@@ -22,4 +22,4 @@ distro: centos
components: [hadoop, yarn]
enable_local_repo: false
smoke_test_components: [mapreduce, pig]
-jdk: "java-1.7.0-openjdk-devel.x86_64"
+jdk: "java-1.8.0-openjdk-devel.x86_64"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/599207ff/provisioner/docker/config_centos7.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_centos7.yaml b/provisioner/docker/config_centos7.yaml
index 44920f4..95724ff 100644
--- a/provisioner/docker/config_centos7.yaml
+++ b/provisioner/docker/config_centos7.yaml
@@ -22,4 +22,4 @@ distro: centos
components: [hadoop, yarn]
enable_local_repo: false
smoke_test_components: [mapreduce, pig]
-jdk: "java-1.7.0-openjdk-devel.x86_64"
+jdk: "java-1.8.0-openjdk-devel.x86_64"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/599207ff/provisioner/docker/config_debian8.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_debian8.yaml b/provisioner/docker/config_debian8.yaml
index 2ed8946..ea8d150 100644
--- a/provisioner/docker/config_debian8.yaml
+++ b/provisioner/docker/config_debian8.yaml
@@ -22,4 +22,4 @@ distro: debian
components: [hadoop, yarn]
enable_local_repo: false
smoke_test_components: [mapreduce, pig]
-jdk: "openjdk-7-jdk"
+jdk: "openjdk-8-jdk"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/599207ff/provisioner/docker/config_ubuntu_trusty.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_ubuntu_trusty.yaml b/provisioner/docker/config_ubuntu_trusty.yaml
index 4ac83dc..a56e97a 100644
--- a/provisioner/docker/config_ubuntu_trusty.yaml
+++ b/provisioner/docker/config_ubuntu_trusty.yaml
@@ -22,4 +22,4 @@ distro: debian
components: [hadoop, yarn]
enable_local_repo: false
smoke_test_components: [mapreduce, pig]
-jdk: "openjdk-7-jdk"
+jdk: "openjdk-8-jdk"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/599207ff/provisioner/vagrant/vagrantconfig.yaml
----------------------------------------------------------------------
diff --git a/provisioner/vagrant/vagrantconfig.yaml b/provisioner/vagrant/vagrantconfig.yaml
index 4ad1aac..aabc7bd 100644
--- a/provisioner/vagrant/vagrantconfig.yaml
+++ b/provisioner/vagrant/vagrantconfig.yaml
@@ -23,4 +23,4 @@ components: [hadoop, yarn, hbase]
enable_local_repo: false
run_smoke_tests: false
smoke_test_components: [mapreduce, pig]
-jdk: "java-1.7.0-openjdk-devel.x86_64"
+jdk: "java-1.8.0-openjdk-devel.x86_64"
[2/2] bigtop git commit: BIGTOP-2047. detect JAVA_HOME for JDK8,
remove obsolete detection code (JDK6/oracle JDK)
Posted by rv...@apache.org.
BIGTOP-2047. detect JAVA_HOME for JDK8, remove obsolete detection code (JDK6/oracle JDK)
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b8959afe
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b8959afe
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b8959afe
Branch: refs/heads/master
Commit: b8959afe650365685bd95301cf567d9990f9856c
Parents: 599207f
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Fri Mar 24 11:27:51 2017 -0700
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Fri Mar 24 11:27:51 2017 -0700
----------------------------------------------------------------------
.../common/bigtop-utils/bigtop-detect-javahome | 46 +++++++++++---------
1 file changed, 25 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b8959afe/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
index b5a90fc..46dca01 100644
--- a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
+++ b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
@@ -20,22 +20,6 @@
BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default}
[ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/bigtop-utils ] && . ${BIGTOP_DEFAULTS_DIR}/bigtop-utils
-JAVA6_HOME_CANDIDATES=(
- '/usr/lib/j2sdk1.6-sun'
- '/usr/lib/jvm/java-6-sun'
- '/usr/lib/jvm/java-1.6.0-sun-1.6.0'
- '/usr/lib/jvm/j2sdk1.6-oracle'
- '/usr/lib/jvm/j2sdk1.6-oracle/jre'
- '/usr/java/jdk1.6'
- '/usr/java/jre1.6'
-)
-
-OPENJAVA6_HOME_CANDIDATES=(
- '/usr/lib/jvm/java-1.6.0-openjdk'
- '/usr/lib/jvm/java-1.6.0-openjdk-'
- '/usr/lib/jvm/jre-1.6.0-openjdk'
-)
-
JAVA7_HOME_CANDIDATES=(
'/usr/java/jdk1.7'
'/usr/java/jre1.7'
@@ -50,24 +34,45 @@ OPENJAVA7_HOME_CANDIDATES=(
'/usr/lib/jvm/java-7-openjdk'
)
+JAVA8_HOME_CANDIDATES=(
+ '/usr/java/jdk1.8'
+ '/usr/java/jre1.8'
+ '/usr/lib/jvm/j2sdk1.8-oracle'
+ '/usr/lib/jvm/j2sdk1.8-oracle/jre'
+ '/usr/lib/jvm/java-8-oracle'
+ '/usr/lib/jdk8-latest'
+)
+
+OPENJAVA8_HOME__CANDIDATES=(
+ '/usr/lib/jvm/java-1.8.0-openjdk-amd64'
+ '/usr/lib/jvm/java-1.8.0-openjdk-ppc64el'
+ '/usr/lib/jvm/java-1.8.0-openjdk'
+ '/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0'
+)
+
MISCJAVA_HOME_CANDIDATES=(
'/Library/Java/Home'
'/usr/java/default'
+ '/usr/lib/jvm/java'
+ '/usr/lib/jvm/jre'
'/usr/lib/jvm/default-java'
'/usr/lib/jvm/java-openjdk'
'/usr/lib/jvm/jre-openjdk'
)
case ${BIGTOP_JAVA_MAJOR} in
- 6) JAVA_HOME_CANDIDATES=(${JAVA6_HOME_CANDIDATES[@]})
+ 6) echo "Java 6 is no longer supported. Please upgrade"
+ exit 1
;;
7) JAVA_HOME_CANDIDATES=(${JAVA7_HOME_CANDIDATES[@]} ${OPENJAVA7_HOME_CANDIDATES[@]})
;;
- *) JAVA_HOME_CANDIDATES=(${JAVA6_HOME_CANDIDATES[@]}
+ 8) JAVA_HOME_CANDIDATES=(${JAVA8_HOME_CANDIDATES[@]} ${OPENJAVA8_HOME_CANDIDATES[@]})
+ ;;
+ *) JAVA_HOME_CANDIDATES=(${JAVA8_HOME_CANDIDATES[@]}
${JAVA7_HOME_CANDIDATES[@]}
${MISCJAVA_HOME_CANDIDATES[@]}
- ${OPENJAVA7_HOME_CANDIDATES[@]}
- ${OPENJAVA6_HOME_CANDIDATES[@]})
+ ${OPENJAVA8_HOME_CANDIDATES[@]}
+ ${OPENJAVA7_HOME_CANDIDATES[@]})
;;
esac
@@ -82,4 +87,3 @@ if [ -z "${JAVA_HOME}" ]; then
done
done
fi
-