From 3f9a04331cc30d5c5ec917cef5cb5687824681e6 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 22 Sep 2023 09:03:35 +0200 Subject: [PATCH] Remove Java 20 from CI Closes gh-37527 --- ci/images/ci-image-jdk20/Dockerfile | 10 --- ci/images/get-jdk-url.sh | 3 - ci/pipeline.yml | 95 +---------------------------- ci/scripts/detect-jdk-updates.sh | 4 -- 4 files changed, 2 insertions(+), 110 deletions(-) delete mode 100644 ci/images/ci-image-jdk20/Dockerfile diff --git a/ci/images/ci-image-jdk20/Dockerfile b/ci/images/ci-image-jdk20/Dockerfile deleted file mode 100644 index badcd467601..00000000000 --- a/ci/images/ci-image-jdk20/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:jammy-20230816 - -ADD setup.sh /setup.sh -ADD get-jdk-url.sh /get-jdk-url.sh -ADD get-docker-url.sh /get-docker-url.sh -RUN ./setup.sh java8 java20 - -ENV JAVA_HOME /opt/openjdk -ENV PATH $JAVA_HOME/bin:$PATH -ADD docker-lib.sh /docker-lib.sh diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 8cdc76229e8..ee495bb70e9 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -11,9 +11,6 @@ case "$1" in java17) echo "https://github.com/bell-sw/Liberica/releases/download/17.0.8.1+1/bellsoft-jdk17.0.8.1+1-linux-amd64.tar.gz" ;; - java20) - echo "https://github.com/bell-sw/Liberica/releases/download/20.0.2+10/bellsoft-jdk20.0.2+10-linux-amd64.tar.gz" - ;; java21) echo "https://github.com/bell-sw/Liberica/releases/download/21+37/bellsoft-jdk21+37-linux-amd64.tar.gz" ;; diff --git a/ci/pipeline.yml b/ci/pipeline.yml index c1d1d7c3df3..6fd4ad0f24d 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -181,12 +181,6 @@ resources: source: <<: *ci-registry-image-resource-source repository: ((docker-hub-organization))/spring-boot-ci-jdk17 -- name: ci-image-jdk20 - type: registry-image - icon: docker - source: - <<: *ci-registry-image-resource-source - repository: ((docker-hub-organization))/spring-boot-ci-jdk20 - name: ci-image-jdk21 type: registry-image icon: docker @@ -233,14 +227,6 @@ resources: access_token: ((github-ci-status-token)) branch: ((branch)) context: jdk17-build -- name: repo-status-jdk20-build - type: github-status-resource - icon: eye-check-outline - source: - repository: ((github-repo-name)) - access_token: ((github-ci-status-token)) - branch: ((branch)) - context: jdk20-build - name: repo-status-jdk21-build type: github-status-resource icon: eye-check-outline @@ -298,13 +284,6 @@ jobs: image: ci-image-jdk17 vars: ci-image-name: ci-image-jdk17 - - task: build-ci-image-jdk20 - privileged: true - file: git-repo/ci/tasks/build-ci-image.yml - output_mapping: - image: ci-image-jdk20 - vars: - ci-image-name: ci-image-jdk20 - task: build-ci-image-jdk21 privileged: true file: git-repo/ci/tasks/build-ci-image.yml @@ -322,9 +301,6 @@ jobs: - put: ci-image-jdk17 params: image: ci-image-jdk17/image.tar - - put: ci-image-jdk20 - params: - image: ci-image-jdk20/image.tar - put: ci-image-jdk21 params: image: ci-image-jdk21/image.tar @@ -353,12 +329,6 @@ jobs: params: <<: *github-task-params JDK_VERSION: java17 - - task: detect-jdk20-update - image: ci-image - file: git-repo/ci/tasks/detect-jdk-updates.yml - params: - <<: *github-task-params - JDK_VERSION: java20 - task: detect-jdk21-update image: ci-image file: git-repo/ci/tasks/detect-jdk-updates.yml @@ -481,38 +451,6 @@ jobs: - put: slack-alert params: <<: *slack-success-params -- name: jdk20-build - serial: true - public: true - plan: - - get: ci-image-jdk20 - - get: git-repo - trigger: true - - put: repo-status-jdk20-build - params: { state: "pending", commit: "git-repo" } - - do: - - task: build-project - image: ci-image-jdk20 - privileged: true - timeout: ((task-timeout)) - file: git-repo/ci/tasks/build-project.yml - params: - BRANCH: ((branch)) - TOOLCHAIN_JAVA_VERSION: 20 - <<: *gradle-enterprise-task-params - <<: *docker-hub-task-params - on_failure: - do: - - put: repo-status-jdk20-build - params: { state: "failure", commit: "git-repo" } - - put: slack-alert - params: - <<: *slack-fail-params - - put: repo-status-jdk20-build - params: { state: "success", commit: "git-repo" } - - put: slack-alert - params: - <<: *slack-success-params - name: jdk21-build serial: true public: true @@ -866,35 +804,6 @@ jobs: - put: slack-alert params: <<: *slack-success-params -- name: jdk20-run-system-tests - serial: true - public: true - plan: - - get: ci-image-jdk20 - - get: git-repo - - get: paketo-builder-base-image - trigger: true - - get: daily - trigger: true - - do: - - task: run-system-tests - image: ci-image-jdk20 - privileged: true - timeout: ((task-timeout)) - file: git-repo/ci/tasks/run-system-tests.yml - params: - BRANCH: ((branch)) - TOOLCHAIN_JAVA_VERSION: 20 - <<: *gradle-enterprise-task-params - <<: *docker-hub-task-params - on_failure: - do: - - put: slack-alert - params: - <<: *slack-fail-params - - put: slack-alert - params: - <<: *slack-success-params - name: jdk21-run-system-tests serial: true public: true @@ -926,11 +835,11 @@ jobs: <<: *slack-success-params groups: - name: "builds" - jobs: ["build", "jdk11-build", "jdk17-build", "jdk20-build", "jdk21-build", "windows-build"] + jobs: ["build", "jdk11-build", "jdk17-build", "jdk21-build", "windows-build"] - name: "releases" jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release", "publish-gradle-plugin", "publish-to-sdkman", "update-homebrew-tap"] - name: "system-tests" - jobs: ["run-system-tests", "jdk11-run-system-tests", "jdk17-run-system-tests", "jdk20-run-system-tests", "jdk21-run-system-tests"] + jobs: ["run-system-tests", "jdk11-run-system-tests", "jdk17-run-system-tests", "jdk21-run-system-tests"] - name: "ci-images" jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"] diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh index 6cd4651024b..1c10febda7e 100755 --- a/ci/scripts/detect-jdk-updates.sh +++ b/ci/scripts/detect-jdk-updates.sh @@ -20,10 +20,6 @@ case "$JDK_VERSION" in BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=17" ISSUE_TITLE="Upgrade Java 17 version in CI image" ;; - java20) - BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=20" - ISSUE_TITLE="Upgrade Java 20 version in CI image" - ;; java21) BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=21" ISSUE_TITLE="Upgrade Java 21 version in CI image"