From 2f78abd56e39eb95c32fd211ca738359f8eec3e5 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 14 Feb 2022 10:29:45 +0100 Subject: [PATCH] Upgrade CI pipeline This commit upgrades the CI pipeline with the following: * replace JDK16 with JDK17 as build variant * upgrade all JDK versions * replace docker-image with registry-image resource for CI image --- ci/images/ci-image/Dockerfile | 2 +- ci/images/get-jdk-url.sh | 9 ++++++--- ci/parameters.yml | 3 --- ci/pipeline.yml | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index c38b735bb7b..edc9eac649b 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -6,6 +6,6 @@ RUN ./setup.sh java8 ENV JAVA_HOME /opt/openjdk/java8 ENV JDK11 /opt/openjdk/java11 -ENV JDK16 /opt/openjdk/java16 +ENV JDK17 /opt/openjdk/java17 ENV PATH $JAVA_HOME/bin:$PATH diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 530866224d1..d090494f662 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -6,10 +6,13 @@ case "$1" in echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz" ;; java11) - echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz" + echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz" ;; - java16) - echo "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz" + java17) + echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz" + ;; + java18) + echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk18-2022-02-12-08-06-beta/OpenJDK18-jdk_x64_linux_hotspot_2022-02-12-08-06.tar.gz" ;; *) echo $"Unknown java version" diff --git a/ci/parameters.yml b/ci/parameters.yml index 28486ecec72..7f26578d27a 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -1,6 +1,3 @@ -email-server: "smtp.svc.pivotal.io" -email-from: "ci@spring.io" -email-to: ["spring-framework-dev@pivotal.io"] github-repo: "https://github.com/spring-projects/spring-framework.git" github-repo-name: "spring-projects/spring-framework" docker-hub-organization: "springci" diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 64f6ffe3ad1..03545186aea 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -87,7 +87,7 @@ resources: branch: ((branch)) paths: ["ci/images/*"] - name: ci-image - type: docker-image + type: registry-image icon: docker source: <<: *docker-resource-source @@ -124,14 +124,14 @@ resources: access_token: ((github-ci-status-token)) branch: ((branch)) context: jdk11-build -- name: repo-status-jdk16-build +- name: repo-status-jdk17-build type: github-status-resource icon: eye-check-outline source: repository: ((github-repo-name)) access_token: ((github-ci-status-token)) branch: ((branch)) - context: jdk16-build + context: jdk17-build - name: slack-alert type: slack-notification icon: slack @@ -249,7 +249,7 @@ jobs: <<: *slack-fail-params - put: repo-status-jdk11-build params: { state: "success", commit: "git-repo" } -- name: jdk16-build +- name: jdk17-build serial: true public: true plan: @@ -257,7 +257,7 @@ jobs: - get: git-repo - get: every-morning trigger: true - - put: repo-status-jdk16-build + - put: repo-status-jdk17-build params: { state: "pending", commit: "git-repo" } - do: - task: check-project @@ -270,12 +270,12 @@ jobs: <<: *build-project-task-params on_failure: do: - - put: repo-status-jdk16-build + - put: repo-status-jdk17-build params: { state: "failure", commit: "git-repo" } - put: slack-alert params: <<: *slack-fail-params - - put: repo-status-jdk16-build + - put: repo-status-jdk17-build params: { state: "success", commit: "git-repo" } - name: build-pull-requests serial: true @@ -458,7 +458,7 @@ jobs: groups: - name: "builds" - jobs: ["build", "jdk11-build", "jdk16-build"] + jobs: ["build", "jdk11-build", "jdk17-build"] - name: "releases" jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"] - name: "ci-images"