Skip to content

Commit 274e9ed

Browse files
committed
Set up CI for JDK 12
Closes gh-16212
1 parent 567a82f commit 274e9ed

File tree

4 files changed

+92
-1
lines changed

4 files changed

+92
-1
lines changed

ci/images/get-jdk-url.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ case "$1" in
88
java11)
99
echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz"
1010
;;
11+
java12)
12+
echo "https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12%2B33/OpenJDK12U-jdk_x64_linux_hotspot_12_33.tar.gz"
13+
;;
1114
*)
1215
echo $"Unknown java version"
1316
exit 1
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM ubuntu:bionic-20181018
2+
3+
ADD setup.sh /setup.sh
4+
ADD get-jdk-url.sh /get-jdk-url.sh
5+
RUN ./setup.sh java12
6+
7+
ENV JAVA_HOME /opt/openjdk
8+
ENV PATH $JAVA_HOME/bin:$PATH
9+
ADD docker-lib.sh /docker-lib.sh
10+
11+
ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]

ci/pipeline.yml

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ resources:
6868
username: ((docker-hub-username))
6969
password: ((docker-hub-password))
7070
tag: ((branch))
71+
- name: spring-boot-jdk12-ci-image
72+
type: docker-image
73+
source:
74+
repository: ((docker-hub-organization))/spring-boot-jdk12-ci-image
75+
username: ((docker-hub-username))
76+
password: ((docker-hub-password))
77+
tag: ((branch))
7178
- name: artifactory-repo
7279
type: artifactory-resource
7380
source:
@@ -89,6 +96,13 @@ resources:
8996
access_token: ((github-access-token))
9097
branch: ((branch))
9198
context: jdk11-build
99+
- name: repo-status-jdk12-build
100+
type: github-status-resource
101+
source:
102+
repository: ((github-repo-name))
103+
access_token: ((github-access-token))
104+
branch: ((branch))
105+
context: jdk12-build
92106
- name: slack-alert
93107
type: slack-notification
94108
source:
@@ -112,6 +126,10 @@ jobs:
112126
params:
113127
build: ci-images-git-repo/ci/images
114128
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image/Dockerfile
129+
- put: spring-boot-jdk12-ci-image
130+
params:
131+
build: ci-images-git-repo/ci/images
132+
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk12-ci-image/Dockerfile
115133
- name: detect-jdk-updates
116134
plan:
117135
- get: git-repo
@@ -137,6 +155,15 @@ jobs:
137155
GITHUB_USERNAME: ((github-username))
138156
JDK_VERSION: java11
139157
image: spring-boot-ci-image
158+
- task: detect-jdk12-update
159+
file: git-repo/ci/tasks/detect-jdk-updates.yml
160+
params:
161+
GITHUB_REPO: spring-boot
162+
GITHUB_ORGANIZATION: spring-projects
163+
GITHUB_PASSWORD: ((github-password))
164+
GITHUB_USERNAME: ((github-username))
165+
JDK_VERSION: java12
166+
image: spring-boot-ci-image
140167
- name: build
141168
serial: true
142169
public: true
@@ -285,6 +312,52 @@ jobs:
285312
silent: true
286313
icon_emoji: ":concourse:"
287314
username: concourse-ci
315+
- name: jdk12-build
316+
serial: true
317+
public: true
318+
plan:
319+
- get: spring-boot-jdk12-ci-image
320+
- get: git-repo
321+
trigger: true
322+
- put: repo-status-jdk12-build
323+
params: { state: "pending", commit: "git-repo" }
324+
- do:
325+
- task: build-project
326+
privileged: true
327+
timeout: 1h30m
328+
image: spring-boot-jdk12-ci-image
329+
file: git-repo/ci/tasks/build-project.yml
330+
- aggregate:
331+
- task: build-samples
332+
timeout: 1h30m
333+
image: spring-boot-jdk12-ci-image
334+
file: git-repo/ci/tasks/build-samples.yml
335+
- task: build-integration-tests
336+
timeout: 1h30m
337+
image: spring-boot-jdk12-ci-image
338+
file: git-repo/ci/tasks/build-integration-tests.yml
339+
- task: build-deployment-tests
340+
timeout: 1h30m
341+
image: spring-boot-jdk12-ci-image
342+
file: git-repo/ci/tasks/build-deployment-tests.yml
343+
on_failure:
344+
do:
345+
- put: repo-status-jdk12-build
346+
params: { state: "failure", commit: "git-repo" }
347+
- put: slack-alert
348+
params:
349+
text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>"
350+
silent: true
351+
icon_emoji: ":concourse:"
352+
username: concourse-ci
353+
- put: repo-status-jdk12-build
354+
params: { state: "success", commit: "git-repo" }
355+
- put: slack-alert
356+
params:
357+
text: ":concourse-succeeded: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!>"
358+
silent: true
359+
icon_emoji: ":concourse:"
360+
username: concourse-ci
288361
- name: stage-milestone
289362
serial: true
290363
plan:
@@ -455,7 +528,7 @@ jobs:
455528
body: generated-release-notes/release-notes.md
456529
groups:
457530
- name: "Build"
458-
jobs: ["build", "jdk11-build"]
531+
jobs: ["build", "jdk11-build", "jdk12-build"]
459532
- name: "Release"
460533
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"]
461534
- name: "CI Images"

ci/scripts/detect-jdk-updates.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ case "$JDK_VERSION" in
1010
BASE_URL="https://api.adoptopenjdk.net/v2/info/releases/openjdk11"
1111
ISSUE_TITLE="Upgrade Java 11 version in CI image"
1212
;;
13+
java12)
14+
BASE_URL="https://api.adoptopenjdk.net/v2/info/releases/openjdk12"
15+
ISSUE_TITLE="Upgrade Java 12 version in CI image"
16+
;;
1317
*)
1418
echo $"Unknown java version"
1519
exit 1;

0 commit comments

Comments
 (0)