diff --git a/ci/images/ci-image-jdk16/Dockerfile b/ci/images/ci-image-jdk16/Dockerfile deleted file mode 100644 index 1ec7f07843..0000000000 --- a/ci/images/ci-image-jdk16/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM ubuntu:focal-20210827 - -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 java16 - -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/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 198e80f9b8..ac77d87be0 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -8,9 +8,6 @@ case "$1" in java11) echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.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/jdk17-2021-09-01-12-34-beta/OpenJDK17-jdk_x64_linux_hotspot_2021-09-01-12-34.tar.gz" ;; diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 28166c95df..313b64822b 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -171,12 +171,6 @@ resources: source: <<: *registry-image-resource-source repository: ((docker-hub-organization))/spring-boot-ci-jdk11 -- name: ci-image-jdk16 - type: registry-image - icon: docker - source: - <<: *registry-image-resource-source - repository: ((docker-hub-organization))/spring-boot-ci-jdk16 - name: ci-image-jdk17 type: registry-image icon: docker @@ -213,14 +207,6 @@ resources: access_token: ((github-ci-status-token)) branch: ((branch)) context: jdk11-build -- name: repo-status-jdk16-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 - name: repo-status-jdk17-build type: github-status-resource icon: eye-check-outline @@ -273,14 +259,6 @@ jobs: vars: ci-image-name: ci-image-jdk11 <<: *registry-mirror-vars - - task: build-ci-image-jdk16 - privileged: true - file: git-repo/ci/tasks/build-ci-image.yml - output_mapping: - image: ci-image-jdk16 - vars: - ci-image-name: ci-image-jdk16 - <<: *registry-mirror-vars - task: build-ci-image-jdk17 privileged: true file: git-repo/ci/tasks/build-ci-image.yml @@ -296,9 +274,6 @@ jobs: - put: ci-image-jdk11 params: image: ci-image-jdk11/image.tar - - put: ci-image-jdk16 - params: - image: ci-image-jdk16/image.tar - put: ci-image-jdk17 params: image: ci-image-jdk17/image.tar @@ -321,12 +296,6 @@ jobs: params: <<: *github-task-params JDK_VERSION: java11 - - task: detect-jdk16-update - image: ci-image - file: git-repo/ci/tasks/detect-jdk-updates.yml - params: - <<: *github-task-params - JDK_VERSION: java16 - task: detect-jdk17-update image: ci-image file: git-repo/ci/tasks/detect-jdk-updates.yml @@ -445,38 +414,6 @@ jobs: - put: slack-alert params: <<: *slack-success-params -- name: jdk16-build - serial: true - public: true - plan: - - get: ci-image-jdk16 - - get: git-repo - trigger: true - - put: repo-status-jdk16-build - params: { state: "pending", commit: "git-repo" } - - do: - - task: build-project - image: ci-image-jdk16 - privileged: true - timeout: ((task-timeout)) - file: git-repo/ci/tasks/build-project.yml - params: - BRANCH: ((branch)) - TOOLCHAIN_JAVA_VERSION: 16 - <<: *gradle-enterprise-task-params - <<: *docker-hub-task-params - on_failure: - do: - - put: repo-status-jdk16-build - params: { state: "failure", commit: "git-repo" } - - put: slack-alert - params: - <<: *slack-fail-params - - put: repo-status-jdk16-build - params: { state: "success", commit: "git-repo" } - - put: slack-alert - params: - <<: *slack-success-params - name: jdk17-build serial: true public: true @@ -804,11 +741,11 @@ jobs: - put: slack-alert params: <<: *slack-success-params -- name: jdk16-run-system-tests +- name: jdk17-run-system-tests serial: true public: true plan: - - get: ci-image-jdk16 + - get: ci-image-jdk17 - get: git-repo - get: paketo-builder-base-image trigger: true @@ -816,13 +753,13 @@ jobs: trigger: true - do: - task: run-system-tests - image: ci-image-jdk16 + image: ci-image-jdk17 privileged: true timeout: ((task-timeout)) file: git-repo/ci/tasks/run-system-tests.yml params: BRANCH: ((branch)) - TOOLCHAIN_JAVA_VERSION: 16 + TOOLCHAIN_JAVA_VERSION: 17 <<: *gradle-enterprise-task-params <<: *docker-hub-task-params on_failure: @@ -835,11 +772,11 @@ jobs: <<: *slack-success-params groups: - name: "builds" - jobs: ["build", "jdk11-build", "jdk16-build", "jdk17-build", "windows-build"] + jobs: ["build", "jdk11-build", "jdk17-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", "jdk16-run-system-tests"] + jobs: ["run-system-tests", "jdk11-run-system-tests", "jdk17-run-system-tests"] - name: "ci-images" jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"] - name: "pull-requests" diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh index d523da774f..620ae6f4fa 100755 --- a/ci/scripts/detect-jdk-updates.sh +++ b/ci/scripts/detect-jdk-updates.sh @@ -16,10 +16,6 @@ case "$JDK_VERSION" in BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/11/ga" ISSUE_TITLE="Upgrade Java 11 version in CI image" ;; - java16) - BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/16/ga" - ISSUE_TITLE="Upgrade Java 16 version in CI image" - ;; java17) BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/17/ea" ISSUE_TITLE="Upgrade Java 17 version in CI image"