Skip to content

Commit

Permalink
Add Java 14 CI
Browse files Browse the repository at this point in the history
Closes gh-20576
  • Loading branch information
dreis2211 authored and snicoll committed Mar 19, 2020
1 parent 579a6ac commit 0e79647
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 1 deletion.
3 changes: 3 additions & 0 deletions ci/images/get-jdk-url.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ case "$1" in
java13)
echo "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz"
;;
java14)
echo "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14%2B36/OpenJDK14U-jdk_x64_linux_hotspot_14_36.tar.gz"
;;
*)
echo $"Unknown java version"
exit 1
Expand Down
11 changes: 11 additions & 0 deletions ci/images/spring-boot-jdk14-ci-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM ubuntu:bionic-20200311

ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
RUN ./setup.sh java14

ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH
ADD docker-lib.sh /docker-lib.sh

ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]
69 changes: 68 additions & 1 deletion ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,14 @@ resources:
username: ((docker-hub-username))
password: ((docker-hub-password))
tag: 2.2.x
- name: spring-boot-jdk14-ci-image
type: docker-image
icon: docker
source:
repository: ((docker-hub-organization))/spring-boot-jdk14-ci-image
username: ((docker-hub-username))
password: ((docker-hub-password))
tag: 2.2.x
- name: artifactory-repo
type: artifactory-resource
icon: package-variant
Expand Down Expand Up @@ -126,6 +134,14 @@ resources:
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk13-build
- name: repo-status-jdk14-build
type: github-status-resource
icon: eye-check-outline
source:
repository: ((github-repo-name))
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk14-build
- name: slack-alert
type: slack-notification
icon: slack
Expand Down Expand Up @@ -160,6 +176,10 @@ jobs:
params:
build: ci-images-git-repo/ci/images
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk13-ci-image/Dockerfile
- put: spring-boot-jdk14-ci-image
params:
build: ci-images-git-repo/ci/images
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk14-ci-image/Dockerfile
- name: detect-jdk-updates
plan:
- get: git-repo
Expand Down Expand Up @@ -194,6 +214,15 @@ jobs:
GITHUB_USERNAME: ((github-username))
JDK_VERSION: java13
image: spring-boot-ci-image
- task: detect-jdk14-update
file: git-repo/ci/tasks/detect-jdk-updates.yml
params:
GITHUB_REPO: spring-boot
GITHUB_ORGANIZATION: spring-projects
GITHUB_PASSWORD: ((github-password))
GITHUB_USERNAME: ((github-username))
JDK_VERSION: java14
image: spring-boot-ci-image
- name: detect-ubuntu-image-updates
plan:
- get: git-repo
Expand Down Expand Up @@ -413,6 +442,44 @@ jobs:
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: jdk14-build
serial: true
public: true
plan:
- get: spring-boot-jdk14-ci-image
- get: git-repo
trigger: true
- put: repo-status-jdk14-build
params: { state: "pending", commit: "git-repo" }
- do:
- task: build-project
privileged: true
timeout: ((task-timeout))
image: spring-boot-jdk14-ci-image
file: git-repo/ci/tasks/build-project.yml
params:
BRANCH: ((branch))
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
on_failure:
do:
- put: repo-status-jdk14-build
params: { state: "failure", commit: "git-repo" }
- put: slack-alert
params:
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!>"
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- put: repo-status-jdk14-build
params: { state: "success", commit: "git-repo" }
- put: slack-alert
params:
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!>"
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: windows-build
serial: true
plan:
Expand Down Expand Up @@ -615,7 +682,7 @@ jobs:
body: generated-release-notes/release-notes.md
groups:
- name: "Build"
jobs: ["build", "jdk11-build", "jdk13-build", "windows-build"]
jobs: ["build", "jdk11-build", "jdk13-build", "jdk14-build", "windows-build"]
- name: "Release"
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"]
- name: "CI Images"
Expand Down
4 changes: 4 additions & 0 deletions ci/scripts/detect-jdk-updates.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ case "$JDK_VERSION" in
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/13"
ISSUE_TITLE="Upgrade Java 13 version in CI image"
;;
java14)
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/14"
ISSUE_TITLE="Upgrade Java 14 version in CI image"
;;
*)
echo $"Unknown java version"
exit 1;
Expand Down

0 comments on commit 0e79647

Please sign in to comment.