Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove JDK 18 CI

Browse Source 
Closes gh-32290
This commit is contained in:
Andy Wilkinson 2022-09-21 19:52:15 +01:00
parent 5affcecd24
commit 856bd84df9
4 changed files with 2 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ci/images/ci-image-jdk18/Dockerfile
View File

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

3
ci/images/get-jdk-url.sh
View File

@ -11,9 +11,6 @@ case "$1" in
java17)
echo "https://github.com/bell-sw/Liberica/releases/download/17.0.4.1+1/bellsoft-jdk17.0.4.1+1-linux-amd64.tar.gz"
;;
java18)
echo "https://github.com/bell-sw/Liberica/releases/download/18.0.2.1+1/bellsoft-jdk18.0.2.1+1-linux-amd64.tar.gz"
;;
java19)
echo "https://github.com/bell-sw/Liberica/releases/download/19+37/bellsoft-jdk19+37-linux-amd64.tar.gz"
;;

96
ci/pipeline.yml
View File

@ -193,12 +193,6 @@ resources:
source:
<<: *registry-image-resource-source
repository: ((docker-hub-organization))/spring-boot-ci-jdk17
- name: ci-image-jdk18
type: registry-image
icon: docker
source:
<<: *registry-image-resource-source
repository: ((docker-hub-organization))/spring-boot-ci-jdk18
- name: ci-image-jdk19
type: registry-image
icon: docker
@ -243,14 +237,6 @@ resources:
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk17-build
- name: repo-status-jdk18-build
type: github-status-resource
icon: eye-check-outline
source:
repository: ((github-repo-name))
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk18-build
- name: repo-status-jdk19-build
type: github-status-resource
icon: eye-check-outline
@ -311,14 +297,6 @@ jobs:
vars:
ci-image-name: ci-image-jdk17
<<: *docker-hub-mirror-vars
- task: build-ci-image-jdk18
privileged: true
file: git-repo/ci/tasks/build-ci-image.yml
output_mapping:
image: ci-image-jdk18
vars:
ci-image-name: ci-image-jdk18
<<: *docker-hub-mirror-vars
- task: build-ci-image-jdk19
privileged: true
file: git-repo/ci/tasks/build-ci-image.yml
@ -337,9 +315,6 @@ jobs:
- put: ci-image-jdk17
params:
image: ci-image-jdk17/image.tar
- put: ci-image-jdk18
params:
image: ci-image-jdk18/image.tar
- put: ci-image-jdk19
params:
image: ci-image-jdk19/image.tar
@ -368,12 +343,6 @@ jobs:
params:
<<: *github-task-params
JDK_VERSION: java17
- task: detect-jdk18-update
image: ci-image
file: git-repo/ci/tasks/detect-jdk-updates.yml
params:
<<: *github-task-params
JDK_VERSION: java18
- task: detect-jdk19-update
image: ci-image
file: git-repo/ci/tasks/detect-jdk-updates.yml
@ -524,38 +493,6 @@ jobs:
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk18-build
serial: true
public: true
plan:
- get: ci-image-jdk18
- get: git-repo
trigger: true
- put: repo-status-jdk18-build
params: { state: "pending", commit: "git-repo" }
- do:
- task: build-project
image: ci-image-jdk18
privileged: true
timeout: ((task-timeout))
file: git-repo/ci/tasks/build-project.yml
params:
BRANCH: ((branch))
TOOLCHAIN_JAVA_VERSION: 18
<<: *gradle-enterprise-task-params
<<: *docker-hub-task-params
on_failure:
do:
- put: repo-status-jdk18-build
params: { state: "failure", commit: "git-repo" }
- put: slack-alert
params:
<<: *slack-fail-params
- put: repo-status-jdk18-build
params: { state: "success", commit: "git-repo" }
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk19-build
serial: true
public: true
@ -912,35 +849,6 @@ jobs:
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk18-run-system-tests
serial: true
public: true
plan:
- get: ci-image-jdk18
- get: git-repo
- get: paketo-builder-base-image
trigger: true
- get: daily
trigger: true
- do:
- task: run-system-tests
image: ci-image-jdk18
privileged: true
timeout: ((task-timeout))
file: git-repo/ci/tasks/run-system-tests.yml
params:
BRANCH: ((branch))
TOOLCHAIN_JAVA_VERSION: 18
<<: *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: jdk19-run-system-tests
serial: true
public: true
@ -972,11 +880,11 @@ jobs:
<<: *slack-success-params
groups:
- name: "builds"
jobs: ["build", "jdk11-build", "jdk17-build", "jdk18-build", "jdk19-build", "windows-build"]
jobs: ["build", "jdk11-build", "jdk17-build", "jdk19-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", "jdk18-run-system-tests", "jdk19-run-system-tests"]
jobs: ["run-system-tests", "jdk11-run-system-tests", "jdk17-run-system-tests", "jdk19-run-system-tests"]
- name: "ci-images"
jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"]
- name: "pull-requests"

4
ci/scripts/detect-jdk-updates.sh
View File

@ -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"
;;
java18)
BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=18"
ISSUE_TITLE="Upgrade Java 18 version in CI image"
;;
java19)
BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=19"
ISSUE_TITLE="Upgrade Java 19 version in CI image"