Skip to content

Commit

Permalink
Remove Java 16 pipeline
Browse files Browse the repository at this point in the history
Closes gh-28023
  • Loading branch information
snicoll committed Sep 15, 2021
1 parent a540da1 commit aa5a645
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 83 deletions.
12 changes: 0 additions & 12 deletions ci/images/ci-image-jdk16/Dockerfile

This file was deleted.

3 changes: 0 additions & 3 deletions ci/images/get-jdk-url.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ case "$1" in
java11)
echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz"
;;
java16)
echo "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
;;
java17)
echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17-2021-09-01-12-34-beta/OpenJDK17-jdk_x64_linux_hotspot_2021-09-01-12-34.tar.gz"
;;
Expand Down
65 changes: 1 addition & 64 deletions ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,6 @@ resources:
source:
<<: *registry-image-resource-source
repository: ((docker-hub-organization))/spring-boot-ci-jdk11
- name: ci-image-jdk16
type: registry-image
icon: docker
source:
<<: *registry-image-resource-source
repository: ((docker-hub-organization))/spring-boot-ci-jdk16
- name: ci-image-jdk17
type: registry-image
icon: docker
Expand Down Expand Up @@ -199,14 +193,6 @@ resources:
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk11-build
- name: repo-status-jdk16-build
type: github-status-resource
icon: eye-check-outline
source:
repository: ((github-repo-name))
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk16-build
- name: repo-status-jdk17-build
type: github-status-resource
icon: eye-check-outline
Expand Down Expand Up @@ -259,14 +245,6 @@ jobs:
vars:
ci-image-name: ci-image-jdk11
<<: *registry-mirror-vars
- task: build-ci-image-jdk16
privileged: true
file: git-repo/ci/tasks/build-ci-image.yml
output_mapping:
image: ci-image-jdk16
vars:
ci-image-name: ci-image-jdk16
<<: *registry-mirror-vars
- task: build-ci-image-jdk17
privileged: true
file: git-repo/ci/tasks/build-ci-image.yml
Expand All @@ -282,9 +260,6 @@ jobs:
- put: ci-image-jdk11
params:
image: ci-image-jdk11/image.tar
- put: ci-image-jdk16
params:
image: ci-image-jdk16/image.tar
- put: ci-image-jdk17
params:
image: ci-image-jdk17/image.tar
Expand All @@ -307,12 +282,6 @@ jobs:
params:
<<: *github-task-params
JDK_VERSION: java11
- task: detect-jdk16-update
image: ci-image
file: git-repo/ci/tasks/detect-jdk-updates.yml
params:
<<: *github-task-params
JDK_VERSION: java16
- task: detect-jdk17-update
image: ci-image
file: git-repo/ci/tasks/detect-jdk-updates.yml
Expand Down Expand Up @@ -431,38 +400,6 @@ jobs:
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk16-build
serial: true
public: true
plan:
- get: ci-image-jdk16
- get: git-repo
trigger: true
- put: repo-status-jdk16-build
params: { state: "pending", commit: "git-repo" }
- do:
- task: build-project
image: ci-image-jdk16
privileged: true
timeout: ((task-timeout))
file: git-repo/ci/tasks/build-project.yml
params:
BRANCH: ((branch))
TOOLCHAIN_JAVA_VERSION: 16
<<: *gradle-enterprise-task-params
<<: *docker-hub-task-params
on_failure:
do:
- put: repo-status-jdk16-build
params: { state: "failure", commit: "git-repo" }
- put: slack-alert
params:
<<: *slack-fail-params
- put: repo-status-jdk16-build
params: { state: "success", commit: "git-repo" }
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk17-build
serial: true
public: true
Expand Down Expand Up @@ -748,7 +685,7 @@ jobs:
repository: updated-homebrew-tap-repo
groups:
- name: "builds"
jobs: ["build", "jdk11-build", "jdk16-build", "jdk17-build", "windows-build"]
jobs: ["build", "jdk11-build", "jdk17-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: "ci-images"
Expand Down
4 changes: 0 additions & 4 deletions ci/scripts/detect-jdk-updates.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ case "$JDK_VERSION" in
BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/11/ga"
ISSUE_TITLE="Upgrade Java 11 version in CI image"
;;
java16)
BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/16/ga"
ISSUE_TITLE="Upgrade Java 16 version in CI image"
;;
java17)
BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/17/ea"
ISSUE_TITLE="Upgrade Java 17 version in CI image"
Expand Down

0 comments on commit aa5a645

Please sign in to comment.