Skip to content

Commit

Permalink
Merge pull request apache#2742 from onichols-pivotal/GEODE-5950-autom…
Browse files Browse the repository at this point in the history
…ate-jdk11-updates

GEODE-5950 ensure images pick up new Java11 versions
  • Loading branch information
dickcav authored Oct 29, 2018
2 parents 89ee39e + a80008a commit 9669d7a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
5 changes: 3 additions & 2 deletions ci/images/google-geode-builder/scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ apt-get install -y --no-install-recommends \
rm -rf /etc/alternatives
mv /etc/keep-alternatives /etc/alternatives

tar xfvz <(curl https://download.java.net/java/GA/jdk11/28/GPL/openjdk-11+28_linux-x64_bin.tar.gz) -C /usr/lib/jvm
mv /usr/lib/jvm/jdk-11 /usr/lib/jvm/java-11-openjdk-amd64
JDK_URL=$(curl -Ls http://jdk.java.net/11 | awk '/linux-x64/{sub(/.*href=./,"");sub(/".*/,"");if(found!=1)print;found=1}')
tar xzf <(curl -s $JDK_URL) -C /usr/lib/jvm
mv /usr/lib/jvm/jdk-11* /usr/lib/jvm/java-11-openjdk-amd64

pushd /tmp
curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz
Expand Down
13 changes: 13 additions & 0 deletions ci/pipelines/images/jinja.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@
---

resources:
- name: once-a-week
type: time
source:
days: [Monday]
start: 6:00 AM
stop: 7:00 AM
interval: 1h
location: US/Pacific

- name: build-concourse-dockerfile
type: git
source:
Expand Down Expand Up @@ -159,6 +168,8 @@ jobs:
serial: true
plan:
- aggregate:
- get: once-a-week
trigger: true
- get: test-container-docker-image
passed: [build-test-container-docker-image]
trigger: true
Expand Down Expand Up @@ -187,6 +198,8 @@ jobs:
serial: true
plan:
- aggregate:
- get: once-a-week
trigger: true
- get: google-windows-geode-builder
trigger: true
- get: alpine-tools-docker-image
Expand Down

0 comments on commit 9669d7a

Please sign in to comment.