Drop Java 15 build

Closes gh-25782
pull/26153/head
Stephane Nicoll 4 years ago
parent ca9fae6b47
commit 0043093a7d

@ -1,12 +0,0 @@
FROM ubuntu:focal-20210217
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 java15
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" ]

@ -8,9 +8,6 @@ case "$1" in
java11)
echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz"
;;
java15)
echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz"
;;
java16)
echo "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz"
;;

@ -156,12 +156,6 @@ resources:
source:
<<: *registry-image-resource-source
repository: ((docker-hub-organization))/spring-boot-ci-jdk11
- name: ci-image-jdk15
type: registry-image
icon: docker
source:
<<: *registry-image-resource-source
repository: ((docker-hub-organization))/spring-boot-ci-jdk15
- name: ci-image-jdk16
type: registry-image
icon: docker
@ -192,14 +186,6 @@ resources:
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk11-build
- name: repo-status-jdk15-build
type: github-status-resource
icon: eye-check-outline
source:
repository: ((github-repo-name))
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk15-build
- name: repo-status-jdk16-build
type: github-status-resource
icon: eye-check-outline
@ -250,13 +236,6 @@ jobs:
image: ci-image-jdk11
vars:
ci-image-name: ci-image-jdk11
- task: build-ci-image-jdk15
privileged: true
file: git-repo/ci/tasks/build-ci-image.yml
output_mapping:
image: ci-image-jdk15
vars:
ci-image-name: ci-image-jdk15
- task: build-ci-image-jdk16
privileged: true
file: git-repo/ci/tasks/build-ci-image.yml
@ -271,9 +250,6 @@ jobs:
- put: ci-image-jdk11
params:
image: ci-image-jdk11/image.tar
- put: ci-image-jdk15
params:
image: ci-image-jdk15/image.tar
- put: ci-image-jdk16
params:
image: ci-image-jdk16/image.tar
@ -296,12 +272,6 @@ jobs:
params:
<<: *github-task-params
JDK_VERSION: java11
- task: detect-jdk15-update
image: ci-image
file: git-repo/ci/tasks/detect-jdk-updates.yml
params:
<<: *github-task-params
JDK_VERSION: java15
- task: detect-jdk16-update
image: ci-image
file: git-repo/ci/tasks/detect-jdk-updates.yml
@ -420,31 +390,6 @@ jobs:
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk15-build
serial: true
public: true
plan:
- get: ci-image-jdk15
- get: git-repo
trigger: true
- put: repo-status-jdk15-build
params: { state: "pending", commit: "git-repo" }
- do:
- task: build-project
image: ci-image-jdk15
<<: *build-project-task-params
on_failure:
do:
- put: repo-status-jdk15-build
params: { state: "failure", commit: "git-repo" }
- put: slack-alert
params:
<<: *slack-fail-params
- put: repo-status-jdk15-build
params: { state: "success", commit: "git-repo" }
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk16-build
serial: true
public: true
@ -700,7 +645,7 @@ jobs:
repository: updated-homebrew-tap-repo
groups:
- name: "builds"
jobs: ["build", "jdk11-build", "jdk15-build", "jdk16-build", "windows-build"]
jobs: ["build", "jdk11-build", "jdk16-build", "windows-build"]
- name: "releases"
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release", "publish-to-sdkman", "update-homebrew-tap"]
- name: "ci-images"

@ -16,10 +16,6 @@ case "$JDK_VERSION" in
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/11/ga"
ISSUE_TITLE="Upgrade Java 11 version in CI image"
;;
java15)
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga"
ISSUE_TITLE="Upgrade Java 15 version in CI image"
;;
java16)
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/16/ga"
ISSUE_TITLE="Upgrade Java 16 version in CI image"

Loading…
Cancel
Save