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/26 20:16:28 UTC
[geode] branch support/1.12 updated: [GEODE-8321] backport liberica
changes to 1.12. (#5479)
This is an automated email from the ASF dual-hosted git repository.
smgoller 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 cdf6846 [GEODE-8321] backport liberica changes to 1.12. (#5479)
cdf6846 is described below
commit cdf6846eab061def60f4dbd78f673a0919aa122b
Author: Sean Goller <se...@goller.net>
AuthorDate: Wed Aug 26 13:15:44 2020 -0700
[GEODE-8321] backport liberica changes to 1.12. (#5479)
* First pass at switching to liberica jdk. (#5312) (#5458)
Authored-by: Sean Goller <sg...@pivotal.io>
(cherry picked from commit be9a2329d1e06f1ae67baaaf875b6ff20b2922cf)
* Change all tests to use liberica instead of openjdk. (#5474)
(cherry picked from commit 43a783bcff70964ecf9cbe3e64db405945bba17c)
---
ci/docker/Dockerfile | 4 +++-
ci/images/alpine-tools/Dockerfile | 2 +-
.../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/pipelines/images/jinja.template.yml | 2 +-
ci/pipelines/shared/jinja.variables.yml | 2 +-
ci/scripts/execute_build.sh | 3 ++-
ci/scripts/execute_build_examples.sh | 3 ++-
ci/scripts/execute_publish.sh | 3 ++-
ci/scripts/execute_tests.sh | 8 ++++++--
ci/scripts/rsync_code_down.sh | 3 ++-
dev-tools/docker/base/Dockerfile | 2 +-
dev-tools/release/deploy_rc_pipeline.sh | 20 ++++++++++----------
docker/Dockerfile | 3 ++-
docker/README.md | 2 +-
geode-assembly/Dockerfile | 3 ++-
gradle/docker.gradle | 2 +-
19 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile
index c37eee2..ff71a41 100644
--- a/ci/docker/Dockerfile
+++ b/ci/docker/Dockerfile
@@ -13,7 +13,7 @@
# 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.
-FROM openjdk:8
+FROM bellsoft/liberica-openjdk-debian:8
ENTRYPOINT []
ARG CHROME_DRIVER_VERSION=2.35
@@ -33,6 +33,7 @@ RUN chmod +x /usr/local/bin/tini \
&& apt-get install -y --no-install-recommends \
apt-transport-https \
lsb-release \
+ gnupg2 \
&& echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
&& echo "deb http://packages.cloud.google.com/apt cloud-sdk-$(lsb_release -c -s) main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \
&& echo "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \
@@ -47,6 +48,7 @@ RUN chmod +x /usr/local/bin/tini \
cgroupfs-mount \
docker-ce \
docker-compose \
+ git \
golang \
google-chrome-stable \
google-cloud-sdk \
diff --git a/ci/images/alpine-tools/Dockerfile b/ci/images/alpine-tools/Dockerfile
index 5bb41da..912d6fb 100644
--- a/ci/images/alpine-tools/Dockerfile
+++ b/ci/images/alpine-tools/Dockerfile
@@ -21,7 +21,7 @@ RUN apk --no-cache add \
musl-dev \
&& go get -v github.com/masterzen/winrm-cli
-FROM openjdk:8-jdk-alpine
+FROM bellsoft/liberica-openjdk-alpine:8
COPY --from=winrm-builder /root/go/bin/winrm-cli /usr/local/bin/winrm
COPY --from=google/cloud-sdk:alpine /google-cloud-sdk /google-cloud-sdk
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..5198d21 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 \
@@ -56,7 +58,9 @@ 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..c420a0b 100644
--- a/ci/images/google-windows-geode-builder/packer.json
+++ b/ci/images/google-windows-geode-builder/packer.json
@@ -78,9 +78,13 @@
"$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",
+ "Move-Item \"C:\\Program Files\\AdoptOpenJDK\\jdk-11*\" c:\\java11-adoptopenjdk",
"choco install -y jdk8 -params 'installdir=c:\\\\java8tmp;source=false'",
- "Move-Item \"C:\\java8tmp\" c:\\java8",
+ "Move-Item \"C:\\java8tmp\" c:\\java8-adoptopenjdk",
+ "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..eb58a04 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 bellsoft-java8-amd64 \
&& rm -rf /etc/alternatives \
&& mv /etc/keep-alternatives /etc/alternatives \
&& apt-get clean \
diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml
index c7953ac..954580d 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -60,7 +60,7 @@ resources:
- name: openjdk8-docker-image
type: docker-image
source:
- repository: openjdk
+ repository: bellsoft/liberica-openjdk-debian
tag: 8
- name: google-geode-builder
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index 66a0edd..77ce929 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -25,7 +25,7 @@ benchmarks:
options: ''
max_in_flight: 4
- title: '_with_ssl'
- flag: '-PwithSsl -PtestJVM=/usr/lib/jvm/java-11-openjdk-amd64/'
+ flag: '-PwithSsl -PtestJVM=/usr/lib/jvm/bellsoft-java11-amd64'
options: '--tests=*GetBenchmark --tests=*PutBenchmark'
max_in_flight: 1
- title: '_with_security_manager'
diff --git a/ci/scripts/execute_build.sh b/ci/scripts/execute_build.sh
index 6eaa907..99d6d27 100755
--- a/ci/scripts/execute_build.sh
+++ b/ci/scripts/execute_build.sh
@@ -82,7 +82,8 @@ 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/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..b09f8e0 100755
--- a/ci/scripts/execute_build_examples.sh
+++ b/ci/scripts/execute_build_examples.sh
@@ -46,7 +46,8 @@ 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/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..5e49cb0 100755
--- a/ci/scripts/execute_publish.sh
+++ b/ci/scripts/execute_publish.sh
@@ -58,7 +58,8 @@ 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/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..29bf1f8 100755
--- a/ci/scripts/execute_tests.sh
+++ b/ci/scripts/execute_tests.sh
@@ -66,13 +66,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/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..75c2c23 100755
--- a/ci/scripts/rsync_code_down.sh
+++ b/ci/scripts/rsync_code_down.sh
@@ -44,7 +44,8 @@ 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/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/dev-tools/docker/base/Dockerfile b/dev-tools/docker/base/Dockerfile
index eb9ef1e..38bdf5a 100644
--- a/dev-tools/docker/base/Dockerfile
+++ b/dev-tools/docker/base/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM openjdk:8
+FROM bellsoft/liberica-openjdk-debian:8
LABEL Vendor="Apache Geode"
LABEL version=unstable
diff --git a/dev-tools/release/deploy_rc_pipeline.sh b/dev-tools/release/deploy_rc_pipeline.sh
index e5a11d5..6f287f5 100755
--- a/dev-tools/release/deploy_rc_pipeline.sh
+++ b/dev-tools/release/deploy_rc_pipeline.sh
@@ -94,7 +94,7 @@ jobs:
image_resource:
type: docker-image
source:
- repository: openjdk
+ repository: bellsoft/liberica-openjdk-debian
tag: 8
inputs:
- name: geode
@@ -120,7 +120,7 @@ jobs:
image_resource:
type: docker-image
source:
- repository: openjdk
+ repository: bellsoft/liberica-openjdk-debian
tag: 8
inputs:
- name: geode
@@ -150,7 +150,7 @@ jobs:
image_resource:
type: docker-image
source:
- repository: openjdk
+ repository: bellsoft/liberica-openjdk-debian
tag: 11
inputs:
- name: geode-examples
@@ -176,7 +176,7 @@ jobs:
image_resource:
type: docker-image
source:
- repository: openjdk
+ repository: bellsoft/liberica-openjdk-debian
tag: 8
inputs:
- name: geode-examples
@@ -207,7 +207,7 @@ jobs:
image_resource:
type: docker-image
source:
- repository: openjdk
+ repository: bellsoft/liberica-openjdk-debian
tag: 8
inputs:
- name: geode-native
@@ -250,7 +250,7 @@ jobs:
image_resource:
type: docker-image
source:
- repository: openjdk
+ repository: bellsoft/liberica-openjdk-debian
tag: 8
inputs:
- name: geode-native
@@ -298,7 +298,7 @@ jobs:
image_resource:
type: docker-image
source:
- repository: openjdk
+ repository: bellsoft/liberica-openjdk-debian
tag: 8
inputs:
- name: geode
@@ -330,7 +330,7 @@ jobs:
image_resource:
type: docker-image
source:
- repository: openjdk
+ repository: bellsoft/liberica-openjdk-debian
tag: 8
inputs:
- name: geode-benchmarks
@@ -367,7 +367,7 @@ jobs:
image_resource:
type: docker-image
source:
- repository: openjdk
+ repository: bellsoft/liberica-openjdk-debian
tag: 8
inputs:
- name: geode
@@ -432,7 +432,7 @@ jobs:
image_resource:
type: docker-image
source:
- repository: openjdk
+ repository: bellsoft/liberica-openjdk-debian
tag: 8
inputs:
- name: geode
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7b5f8f2..415729a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM openjdk:8-jre-alpine
+# FROM openjdk:8-jre-alpine
+FROM bellsoft/liberica-openjdk-alpine:8
# runtime dependencies
RUN apk add --no-cache \
diff --git a/docker/README.md b/docker/README.md
index 5f58312..bb6621b 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,6 +1,6 @@
# Building the container image
-The current Dockerfile is based on the [OpenJDK image](https://hub.docker.com/_/openjdk/) and includes the officially released Apache Geode binaries which are verified via GPG _and_ SHA256.
+The current Dockerfile is based on the [Bellsoft Liberica OpenJDK image](https://hub.docker.com/r/bellsoft/liberica-openjdk-debian) and includes the officially released Apache Geode binaries which are verified via GPG _and_ SHA256.
```
docker build .
diff --git a/geode-assembly/Dockerfile b/geode-assembly/Dockerfile
index 133aab5..29e96a7 100644
--- a/geode-assembly/Dockerfile
+++ b/geode-assembly/Dockerfile
@@ -14,7 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM openjdk:11
+# FROM openjdk:11
+FROM bellsoft/liberica-openjdk-debian:11
COPY geode /geode
ENV GEODE_HOME="/geode"
ENV PATH="${GEODE_HOME}/bin:${PATH}"
diff --git a/gradle/docker.gradle b/gradle/docker.gradle
index 6ae216c..a7d4b06 100644
--- a/gradle/docker.gradle
+++ b/gradle/docker.gradle
@@ -30,7 +30,7 @@
* Additional properties that can be set are:
*
* dunitDockerImage - The docker image used for running parallel dunits. The
- * default image is 'openjdk:8'. The image is required to
+ * default image is 'bellsoft/liberica-openjdk-debian:8'. The image is required to
* have 'JAVA_HOME' set as an environment variable.
* dunitParallelForks - The number of parallel containers that will be
* launched. The default is 8.