Skip to content

Commit 856bd84

Browse files
committed
Remove JDK 18 CI
Closes gh-32290
1 parent 5affcec commit 856bd84

File tree

4 files changed

+2
-113
lines changed

4 files changed

+2
-113
lines changed

ci/images/ci-image-jdk18/Dockerfile

Lines changed: 0 additions & 12 deletions
This file was deleted.

ci/images/get-jdk-url.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ case "$1" in
1111
java17)
1212
echo "https://github.com/bell-sw/Liberica/releases/download/17.0.4.1+1/bellsoft-jdk17.0.4.1+1-linux-amd64.tar.gz"
1313
;;
14-
java18)
15-
echo "https://github.com/bell-sw/Liberica/releases/download/18.0.2.1+1/bellsoft-jdk18.0.2.1+1-linux-amd64.tar.gz"
16-
;;
1714
java19)
1815
echo "https://github.com/bell-sw/Liberica/releases/download/19+37/bellsoft-jdk19+37-linux-amd64.tar.gz"
1916
;;

ci/pipeline.yml

Lines changed: 2 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,6 @@ resources:
193193
source:
194194
<<: *registry-image-resource-source
195195
repository: ((docker-hub-organization))/spring-boot-ci-jdk17
196-
- name: ci-image-jdk18
197-
type: registry-image
198-
icon: docker
199-
source:
200-
<<: *registry-image-resource-source
201-
repository: ((docker-hub-organization))/spring-boot-ci-jdk18
202196
- name: ci-image-jdk19
203197
type: registry-image
204198
icon: docker
@@ -243,14 +237,6 @@ resources:
243237
access_token: ((github-ci-status-token))
244238
branch: ((branch))
245239
context: jdk17-build
246-
- name: repo-status-jdk18-build
247-
type: github-status-resource
248-
icon: eye-check-outline
249-
source:
250-
repository: ((github-repo-name))
251-
access_token: ((github-ci-status-token))
252-
branch: ((branch))
253-
context: jdk18-build
254240
- name: repo-status-jdk19-build
255241
type: github-status-resource
256242
icon: eye-check-outline
@@ -311,14 +297,6 @@ jobs:
311297
vars:
312298
ci-image-name: ci-image-jdk17
313299
<<: *docker-hub-mirror-vars
314-
- task: build-ci-image-jdk18
315-
privileged: true
316-
file: git-repo/ci/tasks/build-ci-image.yml
317-
output_mapping:
318-
image: ci-image-jdk18
319-
vars:
320-
ci-image-name: ci-image-jdk18
321-
<<: *docker-hub-mirror-vars
322300
- task: build-ci-image-jdk19
323301
privileged: true
324302
file: git-repo/ci/tasks/build-ci-image.yml
@@ -337,9 +315,6 @@ jobs:
337315
- put: ci-image-jdk17
338316
params:
339317
image: ci-image-jdk17/image.tar
340-
- put: ci-image-jdk18
341-
params:
342-
image: ci-image-jdk18/image.tar
343318
- put: ci-image-jdk19
344319
params:
345320
image: ci-image-jdk19/image.tar
@@ -368,12 +343,6 @@ jobs:
368343
params:
369344
<<: *github-task-params
370345
JDK_VERSION: java17
371-
- task: detect-jdk18-update
372-
image: ci-image
373-
file: git-repo/ci/tasks/detect-jdk-updates.yml
374-
params:
375-
<<: *github-task-params
376-
JDK_VERSION: java18
377346
- task: detect-jdk19-update
378347
image: ci-image
379348
file: git-repo/ci/tasks/detect-jdk-updates.yml
@@ -524,38 +493,6 @@ jobs:
524493
- put: slack-alert
525494
params:
526495
<<: *slack-success-params
527-
- name: jdk18-build
528-
serial: true
529-
public: true
530-
plan:
531-
- get: ci-image-jdk18
532-
- get: git-repo
533-
trigger: true
534-
- put: repo-status-jdk18-build
535-
params: { state: "pending", commit: "git-repo" }
536-
- do:
537-
- task: build-project
538-
image: ci-image-jdk18
539-
privileged: true
540-
timeout: ((task-timeout))
541-
file: git-repo/ci/tasks/build-project.yml
542-
params:
543-
BRANCH: ((branch))
544-
TOOLCHAIN_JAVA_VERSION: 18
545-
<<: *gradle-enterprise-task-params
546-
<<: *docker-hub-task-params
547-
on_failure:
548-
do:
549-
- put: repo-status-jdk18-build
550-
params: { state: "failure", commit: "git-repo" }
551-
- put: slack-alert
552-
params:
553-
<<: *slack-fail-params
554-
- put: repo-status-jdk18-build
555-
params: { state: "success", commit: "git-repo" }
556-
- put: slack-alert
557-
params:
558-
<<: *slack-success-params
559496
- name: jdk19-build
560497
serial: true
561498
public: true
@@ -912,35 +849,6 @@ jobs:
912849
- put: slack-alert
913850
params:
914851
<<: *slack-success-params
915-
- name: jdk18-run-system-tests
916-
serial: true
917-
public: true
918-
plan:
919-
- get: ci-image-jdk18
920-
- get: git-repo
921-
- get: paketo-builder-base-image
922-
trigger: true
923-
- get: daily
924-
trigger: true
925-
- do:
926-
- task: run-system-tests
927-
image: ci-image-jdk18
928-
privileged: true
929-
timeout: ((task-timeout))
930-
file: git-repo/ci/tasks/run-system-tests.yml
931-
params:
932-
BRANCH: ((branch))
933-
TOOLCHAIN_JAVA_VERSION: 18
934-
<<: *gradle-enterprise-task-params
935-
<<: *docker-hub-task-params
936-
on_failure:
937-
do:
938-
- put: slack-alert
939-
params:
940-
<<: *slack-fail-params
941-
- put: slack-alert
942-
params:
943-
<<: *slack-success-params
944852
- name: jdk19-run-system-tests
945853
serial: true
946854
public: true
@@ -972,11 +880,11 @@ jobs:
972880
<<: *slack-success-params
973881
groups:
974882
- name: "builds"
975-
jobs: ["build", "jdk11-build", "jdk17-build", "jdk18-build", "jdk19-build", "windows-build"]
883+
jobs: ["build", "jdk11-build", "jdk17-build", "jdk19-build", "windows-build"]
976884
- name: "releases"
977885
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"]
978886
- name: "system-tests"
979-
jobs: ["run-system-tests", "jdk11-run-system-tests", "jdk17-run-system-tests", "jdk18-run-system-tests", "jdk19-run-system-tests"]
887+
jobs: ["run-system-tests", "jdk11-run-system-tests", "jdk17-run-system-tests", "jdk19-run-system-tests"]
980888
- name: "ci-images"
981889
jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"]
982890
- name: "pull-requests"

ci/scripts/detect-jdk-updates.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ case "$JDK_VERSION" in
2020
BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=17"
2121
ISSUE_TITLE="Upgrade Java 17 version in CI image"
2222
;;
23-
java18)
24-
BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=18"
25-
ISSUE_TITLE="Upgrade Java 18 version in CI image"
26-
;;
2723
java19)
2824
BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=19"
2925
ISSUE_TITLE="Upgrade Java 19 version in CI image"

0 commit comments

Comments
 (0)