diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 2829f493b2..5fa09c71e0 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -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 diff --git a/ci/images/spring-boot-jdk14-ci-image/Dockerfile b/ci/images/spring-boot-jdk14-ci-image/Dockerfile new file mode 100644 index 0000000000..91c8a67533 --- /dev/null +++ b/ci/images/spring-boot-jdk14-ci-image/Dockerfile @@ -0,0 +1,11 @@ +FROM ubuntu:bionic-20200219 + +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" ] diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 46f2ae26dc..73273b1bed 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -94,6 +94,14 @@ resources: username: ((docker-hub-username)) password: ((docker-hub-password)) tag: 2.3.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.3.x - name: artifactory-repo type: artifactory-resource icon: package-variant @@ -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 @@ -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 @@ -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 @@ -375,6 +404,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: " + 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: " + silent: true + icon_emoji: ":concourse:" + username: concourse-ci - name: windows-build serial: true plan: @@ -591,7 +658,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" diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh index 706d063b82..42503f9791 100755 --- a/ci/scripts/detect-jdk-updates.sh +++ b/ci/scripts/detect-jdk-updates.sh @@ -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;