From 0d324812c791638ca52fee4d94d2a6a6dfb75def Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 22 Jul 2019 16:16:40 +0200 Subject: [PATCH] Add Java 13 CI Closes gh-16970 --- ci/images/get-jdk-url.sh | 5 +- .../spring-boot-jdk13-ci-image/Dockerfile | 11 +++ ci/pipeline.yml | 68 ++++++++++++++++++- 3 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 ci/images/spring-boot-jdk13-ci-image/Dockerfile diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 72beb7879b..82c44891cd 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -11,7 +11,10 @@ case "$1" in java12) echo "https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.1%2B12/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz" ;; - *) + java13) + echo "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk13u-2019-07-17-05-32/OpenJDK13U-jdk_x64_linux_hotspot_2019-07-17-05-32.tar.gz" + ;; + *) echo $"Unknown java version" exit 1 esac diff --git a/ci/images/spring-boot-jdk13-ci-image/Dockerfile b/ci/images/spring-boot-jdk13-ci-image/Dockerfile new file mode 100644 index 0000000000..647f11b154 --- /dev/null +++ b/ci/images/spring-boot-jdk13-ci-image/Dockerfile @@ -0,0 +1,11 @@ +FROM ubuntu:bionic-20181018 + +ADD setup.sh /setup.sh +ADD get-jdk-url.sh /get-jdk-url.sh +RUN ./setup.sh java13 + +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" ] diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 2b8b1ef886..0e4718bf0b 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -83,6 +83,14 @@ resources: username: ((docker-hub-username)) password: ((docker-hub-password)) tag: ((branch)) +- name: spring-boot-jdk13-ci-image + type: docker-image + icon: docker + source: + repository: ((docker-hub-organization))/spring-boot-jdk13-ci-image + username: ((docker-hub-username)) + password: ((docker-hub-password)) + tag: ((branch)) - name: artifactory-repo type: artifactory-resource icon: package-variant @@ -115,6 +123,14 @@ resources: access_token: ((github-ci-status-token)) branch: ((branch)) context: jdk12-build +- name: repo-status-jdk13-build + type: github-status-resource + icon: eye-check-outline + source: + repository: ((github-repo-name)) + access_token: ((github-ci-status-token)) + branch: ((branch)) + context: jdk13-build - name: slack-alert type: slack-notification icon: slack @@ -144,6 +160,10 @@ jobs: params: build: ci-images-git-repo/ci/images dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk12-ci-image/Dockerfile + - put: spring-boot-jdk13-ci-image + params: + build: ci-images-git-repo/ci/images + dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk13-ci-image/Dockerfile - name: detect-jdk-updates plan: - get: git-repo @@ -382,6 +402,52 @@ jobs: silent: true icon_emoji: ":concourse:" username: concourse-ci +- name: jdk13-build + serial: true + public: true + plan: + - get: spring-boot-jdk13-ci-image + - get: git-repo + trigger: true + - put: repo-status-jdk13-build + params: { state: "pending", commit: "git-repo" } + - do: + - task: build-project + privileged: true + timeout: 1h30m + image: spring-boot-jdk13-ci-image + file: git-repo/ci/tasks/build-project.yml + - in_parallel: + - task: build-smoke-tests + timeout: 1h30m + image: spring-boot-jdk13-ci-image + file: git-repo/ci/tasks/build-smoke-tests.yml + - task: build-integration-tests + timeout: 1h30m + image: spring-boot-jdk13-ci-image + file: git-repo/ci/tasks/build-integration-tests.yml + - task: build-deployment-tests + timeout: 1h30m + image: spring-boot-jdk13-ci-image + file: git-repo/ci/tasks/build-deployment-tests.yml + on_failure: + do: + - put: repo-status-jdk13-build + params: { state: "failure", commit: "git-repo" } + - put: slack-alert + params: + text: ":concourse-failed: " + silent: true + icon_emoji: ":concourse:" + username: concourse-ci + - put: repo-status-jdk13-build + params: { state: "success", commit: "git-repo" } + - put: slack-alert + params: + text: ":concourse-succeeded: " + silent: true + icon_emoji: ":concourse:" + username: concourse-ci - name: stage-milestone serial: true plan: @@ -556,7 +622,7 @@ jobs: body: generated-release-notes/release-notes.md groups: - name: "Build" - jobs: ["build", "jdk11-build", "jdk12-build"] + jobs: ["build", "jdk11-build", "jdk12-build", "jdk13-build"] - name: "Release" jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"] - name: "CI Images"