Skip to content

Commit cdfefa1

Browse files
committed
Merge pull request #18848 from dreis2211
* pr/18848: Drop JDK 12-based CI Closes gh-18848
2 parents 6fbac04 + f9cb7c6 commit cdfefa1

File tree

4 files changed

+1
-94
lines changed

4 files changed

+1
-94
lines changed

ci/images/get-jdk-url.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ case "$1" in
88
java11)
99
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"
1010
;;
11-
java12)
12-
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"
13-
;;
1411
*)
1512
echo $"Unknown java version"
1613
exit 1

ci/images/spring-boot-jdk12-ci-image/Dockerfile

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

ci/pipeline.yml

Lines changed: 1 addition & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,6 @@ resources:
8585
username: ((docker-hub-username))
8686
password: ((docker-hub-password))
8787
tag: ((branch))
88-
- name: spring-boot-jdk12-ci-image
89-
type: docker-image
90-
icon: docker
91-
source:
92-
repository: ((docker-hub-organization))/spring-boot-jdk12-ci-image
93-
username: ((docker-hub-username))
94-
password: ((docker-hub-password))
95-
tag: ((branch))
9688
- name: artifactory-repo
9789
type: artifactory-resource
9890
icon: package-variant
@@ -117,14 +109,6 @@ resources:
117109
access_token: ((github-ci-status-token))
118110
branch: ((branch))
119111
context: jdk11-build
120-
- name: repo-status-jdk12-build
121-
type: github-status-resource
122-
icon: eye-check-outline
123-
source:
124-
repository: ((github-repo-name))
125-
access_token: ((github-ci-status-token))
126-
branch: ((branch))
127-
context: jdk12-build
128112
- name: slack-alert
129113
type: slack-notification
130114
icon: slack
@@ -153,10 +137,6 @@ jobs:
153137
params:
154138
build: ci-images-git-repo/ci/images
155139
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image/Dockerfile
156-
- put: spring-boot-jdk12-ci-image
157-
params:
158-
build: ci-images-git-repo/ci/images
159-
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk12-ci-image/Dockerfile
160140
- name: detect-jdk-updates
161141
plan:
162142
- get: git-repo
@@ -182,15 +162,6 @@ jobs:
182162
GITHUB_USERNAME: ((github-username))
183163
JDK_VERSION: java11
184164
image: spring-boot-ci-image
185-
- task: detect-jdk12-update
186-
file: git-repo/ci/tasks/detect-jdk-updates.yml
187-
params:
188-
GITHUB_REPO: spring-boot
189-
GITHUB_ORGANIZATION: spring-projects
190-
GITHUB_PASSWORD: ((github-password))
191-
GITHUB_USERNAME: ((github-username))
192-
JDK_VERSION: java12
193-
image: spring-boot-ci-image
194165
- name: build
195166
serial: true
196167
public: true
@@ -347,52 +318,6 @@ jobs:
347318
silent: true
348319
icon_emoji: ":concourse:"
349320
username: concourse-ci
350-
- name: jdk12-build
351-
serial: true
352-
public: true
353-
plan:
354-
- get: spring-boot-jdk12-ci-image
355-
- get: git-repo
356-
trigger: true
357-
- put: repo-status-jdk12-build
358-
params: { state: "pending", commit: "git-repo" }
359-
- do:
360-
- task: build-project
361-
privileged: true
362-
timeout: ((task-timeout))
363-
image: spring-boot-jdk12-ci-image
364-
file: git-repo/ci/tasks/build-project.yml
365-
- in_parallel:
366-
- task: build-samples
367-
timeout: ((task-timeout))
368-
image: spring-boot-jdk12-ci-image
369-
file: git-repo/ci/tasks/build-samples.yml
370-
- task: build-integration-tests
371-
timeout: ((task-timeout))
372-
image: spring-boot-jdk12-ci-image
373-
file: git-repo/ci/tasks/build-integration-tests.yml
374-
- task: build-deployment-tests
375-
timeout: ((task-timeout))
376-
image: spring-boot-jdk12-ci-image
377-
file: git-repo/ci/tasks/build-deployment-tests.yml
378-
on_failure:
379-
do:
380-
- put: repo-status-jdk12-build
381-
params: { state: "failure", commit: "git-repo" }
382-
- put: slack-alert
383-
params:
384-
text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>"
385-
silent: true
386-
icon_emoji: ":concourse:"
387-
username: concourse-ci
388-
- put: repo-status-jdk12-build
389-
params: { state: "success", commit: "git-repo" }
390-
- put: slack-alert
391-
params:
392-
text: ":concourse-succeeded: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!>"
393-
silent: true
394-
icon_emoji: ":concourse:"
395-
username: concourse-ci
396321
- name: windows-build
397322
serial: true
398323
plan:
@@ -595,7 +520,7 @@ jobs:
595520
body: generated-release-notes/release-notes.md
596521
groups:
597522
- name: "Build"
598-
jobs: ["build", "jdk11-build", "jdk12-build", "windows-build"]
523+
jobs: ["build", "jdk11-build", "windows-build"]
599524
- name: "Release"
600525
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"]
601526
- name: "CI Images"

ci/scripts/detect-jdk-updates.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ case "$JDK_VERSION" in
99
BASE_URL="https://api.adoptopenjdk.net/v2/info/releases/openjdk11"
1010
ISSUE_TITLE="Upgrade Java 11 version in CI image"
1111
;;
12-
java12)
13-
BASE_URL="https://api.adoptopenjdk.net/v2/info/releases/openjdk12"
14-
ISSUE_TITLE="Upgrade Java 12 version in CI image"
15-
;;
1612
*)
1713
echo $"Unknown java version"
1814
exit 1;

0 commit comments

Comments
 (0)