diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 88875c789c..7ea427f33d 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/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz" ;; - java12) - echo "https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jdk_x64_linux_hotspot_12.0.2_10.tar.gz" - ;; java13) echo "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.1%2B9/OpenJDK13U-jdk_x64_linux_hotspot_13.0.1_9.tar.gz" ;; diff --git a/ci/images/spring-boot-jdk12-ci-image/Dockerfile b/ci/images/spring-boot-jdk12-ci-image/Dockerfile deleted file mode 100644 index 0652a319a5..0000000000 --- a/ci/images/spring-boot-jdk12-ci-image/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM ubuntu:bionic-20190807 - -ADD setup.sh /setup.sh -ADD get-jdk-url.sh /get-jdk-url.sh -RUN ./setup.sh java12 - -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 ddc8b21734..78b193ec40 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -86,14 +86,6 @@ resources: username: ((docker-hub-username)) password: ((docker-hub-password)) tag: ((branch)) -- name: spring-boot-jdk12-ci-image - type: docker-image - icon: docker - source: - repository: ((docker-hub-organization))/spring-boot-jdk12-ci-image - username: ((docker-hub-username)) - password: ((docker-hub-password)) - tag: ((branch)) - name: spring-boot-jdk13-ci-image type: docker-image icon: docker @@ -126,14 +118,6 @@ resources: access_token: ((github-ci-status-token)) branch: ((branch)) context: jdk11-build -- name: repo-status-jdk12-build - type: github-status-resource - icon: eye-check-outline - source: - repository: ((github-repo-name)) - access_token: ((github-ci-status-token)) - branch: ((branch)) - context: jdk12-build - name: repo-status-jdk13-build type: github-status-resource icon: eye-check-outline @@ -171,10 +155,6 @@ jobs: params: build: ci-images-git-repo/ci/images dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image/Dockerfile - - put: spring-boot-jdk12-ci-image - 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 @@ -204,15 +184,6 @@ jobs: GITHUB_USERNAME: ((github-username)) JDK_VERSION: java11 image: spring-boot-ci-image - - task: detect-jdk12-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: java12 - image: spring-boot-ci-image - task: detect-jdk13-update file: git-repo/ci/tasks/detect-jdk-updates.yml params: @@ -380,52 +351,6 @@ jobs: silent: true icon_emoji: ":concourse:" username: concourse-ci -- name: jdk12-build - serial: true - public: true - plan: - - get: spring-boot-jdk12-ci-image - - get: git-repo - trigger: true - - put: repo-status-jdk12-build - params: { state: "pending", commit: "git-repo" } - - do: - - task: build-project - privileged: true - timeout: ((task-timeout)) - image: spring-boot-jdk12-ci-image - file: git-repo/ci/tasks/build-project.yml - - in_parallel: - - task: build-smoke-tests - timeout: ((task-timeout)) - image: spring-boot-jdk12-ci-image - file: git-repo/ci/tasks/build-smoke-tests.yml - - task: build-integration-tests - timeout: ((task-timeout)) - image: spring-boot-jdk12-ci-image - file: git-repo/ci/tasks/build-integration-tests.yml - - task: build-deployment-tests - timeout: ((task-timeout)) - image: spring-boot-jdk12-ci-image - file: git-repo/ci/tasks/build-deployment-tests.yml - on_failure: - do: - - put: repo-status-jdk12-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-jdk12-build - params: { state: "success", commit: "git-repo" } - - put: slack-alert - params: - text: ":concourse-succeeded: " - silent: true - icon_emoji: ":concourse:" - username: concourse-ci - name: jdk13-build serial: true public: true @@ -674,7 +599,7 @@ jobs: body: generated-release-notes/release-notes.md groups: - name: "Build" - jobs: ["build", "jdk11-build", "jdk12-build", "jdk13-build", "windows-build"] + jobs: ["build", "jdk11-build", "jdk13-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 c7d0e4f52c..f848df73b1 100755 --- a/ci/scripts/detect-jdk-updates.sh +++ b/ci/scripts/detect-jdk-updates.sh @@ -9,10 +9,6 @@ case "$JDK_VERSION" in BASE_URL="https://api.adoptopenjdk.net/v2/info/releases/openjdk11" ISSUE_TITLE="Upgrade Java 11 version in CI image" ;; - java12) - BASE_URL="https://api.adoptopenjdk.net/v2/info/releases/openjdk12" - ISSUE_TITLE="Upgrade Java 12 version in CI image" - ;; java13) BASE_URL="https://api.adoptopenjdk.net/v2/info/releases/openjdk13" ISSUE_TITLE="Upgrade Java 13 version in CI image"