You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2020/06/26 17:41:16 UTC
[geode] branch support/1.12 updated: First pass at switching to
liberica jdk. (#5312)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 17c26fe First pass at switching to liberica jdk. (#5312)
17c26fe is described below
commit 17c26fe9f83571ef13b7b4f50b6a2531a6c33d6c
Author: Sean Goller <sg...@pivotal.io>
AuthorDate: Fri Jun 26 09:24:23 2020 -0700
First pass at switching to liberica jdk. (#5312)
Authored-by: Sean Goller <sg...@pivotal.io>
(cherry picked from commit 15d6d26b72d020fc24964c9cde8ec51aef4881eb)
---
ci/images/google-geode-builder/scripts/cache_dependencies.sh | 2 +-
ci/images/google-geode-builder/scripts/setup.sh | 6 ++++--
ci/images/google-windows-geode-builder/packer.json | 8 ++++----
ci/images/test-container/Dockerfile | 6 ++++--
ci/scripts/execute_build.sh | 2 +-
ci/scripts/execute_build_examples.sh | 2 +-
ci/scripts/execute_publish.sh | 2 +-
ci/scripts/execute_tests.sh | 4 ++--
ci/scripts/rsync_code_down.sh | 2 +-
docker/Dockerfile | 2 +-
10 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/ci/images/google-geode-builder/scripts/cache_dependencies.sh b/ci/images/google-geode-builder/scripts/cache_dependencies.sh
index bca4da1..97c06c5 100644
--- a/ci/images/google-geode-builder/scripts/cache_dependencies.sh
+++ b/ci/images/google-geode-builder/scripts/cache_dependencies.sh
@@ -19,7 +19,7 @@ set -e
WORK_DIR=$(mktemp -d)
-export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64
+export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64
echo "JAVA_HOME is [${JAVA_HOME}]"
if [ -z ${JAVA_HOME} ]; then
diff --git a/ci/images/google-geode-builder/scripts/setup.sh b/ci/images/google-geode-builder/scripts/setup.sh
index 16a38f4..903ac7c 100755
--- a/ci/images/google-geode-builder/scripts/setup.sh
+++ b/ci/images/google-geode-builder/scripts/setup.sh
@@ -29,8 +29,10 @@ apt-get install -y --no-install-recommends \
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list
echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
+echo "deb [arch=amd64] https://apt.bell-sw.com/ stable main" | sudo tee /etc/apt/sources.list.d/bellsoft.list
curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
+curl -fsSL https://download.bell-sw.com/pki/GPG-KEY-bellsoft | apt-key add -
apt-get update
set +e && apt-get purge -y google-cloud-sdk lxc-docker && set -e
apt-get install -y --no-install-recommends \
@@ -55,8 +57,8 @@ apt-get install -y --no-install-recommends \
cp -R /etc/alternatives /etc/keep-alternatives
apt-get install -y --no-install-recommends \
- openjdk-8-jdk \
- openjdk-11-jdk
+ bellsoft-java11 \
+ bellsoft-java8
rm -rf /etc/alternatives
mv /etc/keep-alternatives /etc/alternatives
diff --git a/ci/images/google-windows-geode-builder/packer.json b/ci/images/google-windows-geode-builder/packer.json
index 7b63db5..145ea50 100644
--- a/ci/images/google-windows-geode-builder/packer.json
+++ b/ci/images/google-windows-geode-builder/packer.json
@@ -77,10 +77,10 @@
"inline": [
"$ErrorActionPreference = \"Stop\"",
"Set-ExecutionPolicy Bypass -Scope Process -Force",
- "choco install -y git cygwin cyg-get adoptopenjdk11",
- "Move-Item \"C:\\Program Files\\AdoptOpenJDK\\jdk-11*\" c:\\java11",
- "choco install -y jdk8 -params 'installdir=c:\\\\java8tmp;source=false'",
- "Move-Item \"C:\\java8tmp\" c:\\java8",
+ "choco install -y git cygwin cyg-get liberica11jdk",
+ "Move-Item \"C:\\Program Files\\BellSoft\\LibericaJDK-11*\" c:\\java11",
+ "choco install -y liberica8jdk",
+ "Move-Item \"C:\\Program Files\\BellSoft\\LibericaJDK-8*\" c:\\java8",
"choco install -y openssh --version 7.7.2.1 /SSHServerFeature",
"refreshenv",
"$OldPath = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\Environment' -Name PATH).Path",
diff --git a/ci/images/test-container/Dockerfile b/ci/images/test-container/Dockerfile
index 16758c3..1c14b2a 100644
--- a/ci/images/test-container/Dockerfile
+++ b/ci/images/test-container/Dockerfile
@@ -30,7 +30,9 @@ RUN apt-get update \
unzip \
xz-utils \
&& echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
+ && echo "deb [arch=amd64] https://apt.bell-sw.com/ stable main" > /etc/apt/sources.list.d/bellsoft.list \
&& curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
+ && curl -fsSL https://download.bell-sw.com/pki/GPG-KEY-bellsoft | apt-key add - \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
aptitude \
@@ -46,8 +48,8 @@ RUN apt-get update \
&& useradd --shell /bin/bash -u 93043 -o -c "" -m geode \
&& cp -R /etc/alternatives /etc/keep-alternatives \
&& apt-get install -y --no-install-recommends \
- openjdk-8-jdk \
- openjdk-11-jdk \
+ bellsoft-java11 \
+ bellsoft-java8 \
&& rm -rf /etc/alternatives \
&& mv /etc/keep-alternatives /etc/alternatives \
&& apt-get clean \
diff --git a/ci/scripts/execute_build.sh b/ci/scripts/execute_build.sh
index 6eaa907..1459c5d 100755
--- a/ci/scripts/execute_build.sh
+++ b/ci/scripts/execute_build.sh
@@ -82,7 +82,7 @@ else
DUNIT_PARALLEL_FORKS=""
fi
-SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64"
+SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64"
if [ -v CALL_STACK_TIMEOUT ]; then
ssh ${SSH_OPTIONS} geode@${INSTANCE_IP_ADDRESS} "${SET_JAVA_HOME} && tmux new-session -d -s callstacks; tmux send-keys ~/capture-call-stacks.sh\ ${PARALLEL_DUNIT}\ ${CALL_STACK_TIMEOUT} C-m"
diff --git a/ci/scripts/execute_build_examples.sh b/ci/scripts/execute_build_examples.sh
index 87a56a3..e490c5e 100755
--- a/ci/scripts/execute_build_examples.sh
+++ b/ci/scripts/execute_build_examples.sh
@@ -46,7 +46,7 @@ INSTANCE_IP_ADDRESS="$(cat instance-data/instance-ip-address)"
GEODE_VERSION=$(jq -r .semver geode-passing-tokens/*.json)
-SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64"
+SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64"
GRADLE_COMMAND="./gradlew \
${DEFAULT_GRADLE_TASK_OPTIONS} \
diff --git a/ci/scripts/execute_publish.sh b/ci/scripts/execute_publish.sh
index 32b4333..84ab06a 100755
--- a/ci/scripts/execute_publish.sh
+++ b/ci/scripts/execute_publish.sh
@@ -58,7 +58,7 @@ SSH_OPTIONS="-i ${SSHKEY_FILE} -o ConnectionAttempts=60 -o StrictHostKeyChecking
INSTANCE_IP_ADDRESS="$(cat instance-data/instance-ip-address)"
-SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64"
+SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64"
GRADLE_COMMAND="./gradlew \
${DEFAULT_GRADLE_TASK_OPTIONS} \
diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh
index f038b98..0aff4ea 100755
--- a/ci/scripts/execute_tests.sh
+++ b/ci/scripts/execute_tests.sh
@@ -71,8 +71,8 @@ case $ARTIFACT_SLUG in
SEP=";"
;;
*)
- JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64
- JAVA_TEST_PATH=/usr/lib/jvm/java-${JAVA_TEST_VERSION}-openjdk-amd64
+ JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64
+ JAVA_TEST_PATH=/usr/lib/jvm/bellsoft-java${JAVA_TEST_VERSION}-amd64
SEP="&&"
;;
esac
diff --git a/ci/scripts/rsync_code_down.sh b/ci/scripts/rsync_code_down.sh
index b003a3b..133e38e 100755
--- a/ci/scripts/rsync_code_down.sh
+++ b/ci/scripts/rsync_code_down.sh
@@ -44,7 +44,7 @@ case $ARTIFACT_SLUG in
EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH}; cd geode; ./gradlew --no-daemon combineReports'"
;;
*)
- JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64
+ JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64
EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH} && cd geode && ./gradlew --no-daemon combineReports'"
;;
esac
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7b5f8f2..7b23576 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM openjdk:8-jre-alpine
+FROM bellsoft/liberica-openjdk-alpine:8
# runtime dependencies
RUN apk add --no-cache \