You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sm...@apache.org on 2020/08/18 19:45:46 UTC
[geode] branch develop updated: First pass at switching to liberica
jdk. (#5312) (#5458)
This is an automated email from the ASF dual-hosted git repository.
smgoller pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new be9a232 First pass at switching to liberica jdk. (#5312) (#5458)
be9a232 is described below
commit be9a2329d1e06f1ae67baaaf875b6ff20b2922cf
Author: Sean Goller <sg...@pivotal.io>
AuthorDate: Tue Aug 18 12:45:11 2020 -0700
First pass at switching to liberica jdk. (#5312) (#5458)
Authored-by: Sean Goller <sg...@pivotal.io>
---
ci/images/google-geode-builder/scripts/setup.sh | 6 +++++-
ci/images/google-windows-geode-builder/packer.json | 4 ++++
ci/images/test-container/Dockerfile | 6 ++++++
ci/scripts/execute_build.sh | 1 +
ci/scripts/execute_build_examples.sh | 1 +
ci/scripts/execute_publish.sh | 1 +
ci/scripts/execute_tests.sh | 4 ++++
ci/scripts/rsync_code_down.sh | 1 +
docker/Dockerfile | 1 +
geode-assembly/Dockerfile | 1 +
10 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/ci/images/google-geode-builder/scripts/setup.sh b/ci/images/google-geode-builder/scripts/setup.sh
index 32f4c5a..78b0f47 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
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -57,7 +59,9 @@ DEBIAN_FRONTEND=noninteractive 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
+ 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..b86bfae 100644
--- a/ci/images/google-windows-geode-builder/packer.json
+++ b/ci/images/google-windows-geode-builder/packer.json
@@ -81,6 +81,10 @@
"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-liberica",
+ "choco install -y liberica8jdk",
+ "Move-Item \"C:\\Program Files\\BellSoft\\LibericaJDK-8*\" c:\\java8-liberica",
"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..5a92cfa 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 \
@@ -48,6 +50,10 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends \
openjdk-8-jdk \
openjdk-11-jdk \
+ java-common \
+ bellsoft-java11 \
+ bellsoft-java8 \
+ && update-java-alternatives -s java-1.8.0-openjdk-amd64 \
&& 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 b812dca..ba898b2 100755
--- a/ci/scripts/execute_build.sh
+++ b/ci/scripts/execute_build.sh
@@ -85,6 +85,7 @@ else
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..356e1c7 100755
--- a/ci/scripts/execute_build_examples.sh
+++ b/ci/scripts/execute_build_examples.sh
@@ -47,6 +47,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..ba30963 100755
--- a/ci/scripts/execute_publish.sh
+++ b/ci/scripts/execute_publish.sh
@@ -59,6 +59,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 da98e39..eff6769 100755
--- a/ci/scripts/execute_tests.sh
+++ b/ci/scripts/execute_tests.sh
@@ -69,13 +69,17 @@ fi
case $ARTIFACT_SLUG in
windows*)
+ echo "Making environment adjustments for windows."
JAVA_BUILD_PATH=C:/java${JAVA_BUILD_VERSION}
JAVA_TEST_PATH=C:/java${JAVA_TEST_VERSION}
+ GRADLE_SKIP_TASK_OPTIONS="${GRADLE_SKIP_TASK_OPTIONS} -x docker"
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 55b61d8..e6ae06c 100755
--- a/ci/scripts/rsync_code_down.sh
+++ b/ci/scripts/rsync_code_down.sh
@@ -48,6 +48,7 @@ case $ARTIFACT_SLUG in
;;
*)
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 05f92cc..7da5b6d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,6 +15,7 @@
# limitations under the License.
FROM openjdk:8-jre-alpine
+# FROM bellsoft/liberica-openjdk-alpine:8
# runtime dependencies
RUN apk add --no-cache \
diff --git a/geode-assembly/Dockerfile b/geode-assembly/Dockerfile
index 133aab5..77081bf 100644
--- a/geode-assembly/Dockerfile
+++ b/geode-assembly/Dockerfile
@@ -15,6 +15,7 @@
# limitations under the License.
FROM openjdk:11
+# FROM bellsoft/liberica-openjdk-debian:11
COPY geode /geode
ENV GEODE_HOME="/geode"
ENV PATH="${GEODE_HOME}/bin:${PATH}"