Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz"
;;
java12)
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"
;;
*)
echo $"Unknown java version"
exit 1
Expand Down
11 changes: 0 additions & 11 deletions ci/images/spring-boot-jdk12-ci-image/Dockerfile

This file was deleted.

77 changes: 1 addition & 76 deletions ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,6 @@ resources:
username: ((docker-hub-username))
password: ((docker-hub-password))
tag: ((branch))
- name: spring-boot-jdk12-ci-image
type: docker-image
icon: docker
source:
repository: ((docker-hub-organization))/spring-boot-jdk12-ci-image
username: ((docker-hub-username))
password: ((docker-hub-password))
tag: ((branch))
- name: artifactory-repo
type: artifactory-resource
icon: package-variant
Expand All @@ -117,14 +109,6 @@ resources:
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk11-build
- name: repo-status-jdk12-build
type: github-status-resource
icon: eye-check-outline
source:
repository: ((github-repo-name))
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk12-build
- name: slack-alert
type: slack-notification
icon: slack
Expand Down Expand Up @@ -153,10 +137,6 @@ jobs:
params:
build: ci-images-git-repo/ci/images
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image/Dockerfile
- put: spring-boot-jdk12-ci-image
params:
build: ci-images-git-repo/ci/images
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk12-ci-image/Dockerfile
- name: detect-jdk-updates
plan:
- get: git-repo
Expand All @@ -182,15 +162,6 @@ jobs:
GITHUB_USERNAME: ((github-username))
JDK_VERSION: java11
image: spring-boot-ci-image
- task: detect-jdk12-update
file: git-repo/ci/tasks/detect-jdk-updates.yml
params:
GITHUB_REPO: spring-boot
GITHUB_ORGANIZATION: spring-projects
GITHUB_PASSWORD: ((github-password))
GITHUB_USERNAME: ((github-username))
JDK_VERSION: java12
image: spring-boot-ci-image
- name: build
serial: true
public: true
Expand Down Expand Up @@ -347,52 +318,6 @@ jobs:
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: jdk12-build
serial: true
public: true
plan:
- get: spring-boot-jdk12-ci-image
- get: git-repo
trigger: true
- put: repo-status-jdk12-build
params: { state: "pending", commit: "git-repo" }
- do:
- task: build-project
privileged: true
timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-project.yml
- in_parallel:
- task: build-samples
timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-samples.yml
- task: build-integration-tests
timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-integration-tests.yml
- task: build-deployment-tests
timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-deployment-tests.yml
on_failure:
do:
- put: repo-status-jdk12-build
params: { state: "failure", commit: "git-repo" }
- put: slack-alert
params:
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!>"
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- put: repo-status-jdk12-build
params: { state: "success", commit: "git-repo" }
- put: slack-alert
params:
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!>"
silent: true
icon_emoji: ":concourse:"
username: concourse-ci
- name: windows-build
serial: true
plan:
Expand Down Expand Up @@ -595,7 +520,7 @@ jobs:
body: generated-release-notes/release-notes.md
groups:
- name: "Build"
jobs: ["build", "jdk11-build", "jdk12-build", "windows-build"]
jobs: ["build", "jdk11-build", "windows-build"]
- name: "Release"
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"]
- 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 @@ -9,10 +9,6 @@ case "$JDK_VERSION" in
BASE_URL="https://api.adoptopenjdk.net/v2/info/releases/openjdk11"
ISSUE_TITLE="Upgrade Java 11 version in CI image"
;;
java12)
BASE_URL="https://api.adoptopenjdk.net/v2/info/releases/openjdk12"
ISSUE_TITLE="Upgrade Java 12 version in CI image"
;;
*)
echo $"Unknown java version"
exit 1;
Expand Down