mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 03:13:21 +08:00
Remove JDK 9 and 10-based CI and add JDK 12
Closes gh-15031
This commit is contained in:
Andy Wilkinson
parent
8d6d1f4a57
commit
9bb7edcb88
@ -1,33 +0,0 @@
|
||||
FROM openjdk:10.0.2-13-jdk
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y git && \
|
||||
apt-get install -y libxml2-utils && \
|
||||
apt-get install -y jq
|
||||
|
||||
ADD https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.2/concourse-java.sh /opt/
|
||||
|
||||
ENV DOCKER_VERSION=17.05.0-ce \
|
||||
ENTRYKIT_VERSION=0.4.0
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y curl && \
|
||||
apt-get install -y libudev1 && \
|
||||
apt-get install -y iptables && \
|
||||
curl https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz | tar zx && \
|
||||
mv /docker/* /bin/ && chmod +x /bin/docker*
|
||||
|
||||
# Install entrykit
|
||||
RUN curl -L https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_VERSION}/entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz | tar zx && \
|
||||
chmod +x entrykit && \
|
||||
mv entrykit /bin/entrykit && \
|
||||
entrykit --symlink
|
||||
|
||||
ADD https://raw.githubusercontent.com/spring-projects/spring-boot/master/ci/images/docker-lib.sh /docker-lib.sh
|
||||
|
||||
ENTRYPOINT [ \
|
||||
"switch", \
|
||||
"shell=/bin/sh", "--", \
|
||||
"codep", \
|
||||
"/bin/docker daemon" \
|
||||
]
|
||||
@ -1,4 +1,4 @@
|
||||
FROM openjdk:9.0.4-12-jdk
|
||||
FROM openjdk:12-ea-17-jdk
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y git && \
|
||||
149
ci/pipeline.yml
149
ci/pipeline.yml
@ -134,15 +134,12 @@ jobs:
|
||||
- put: spring-boot-ci-image
|
||||
params:
|
||||
build: ci-images-git-repo/ci/images/spring-boot-ci-image
|
||||
- put: spring-boot-jdk9-ci-image
|
||||
params:
|
||||
build: ci-images-git-repo/ci/images/spring-boot-jdk9-ci-image
|
||||
- put: spring-boot-jdk10-ci-image
|
||||
params:
|
||||
build: ci-images-git-repo/ci/images/spring-boot-jdk10-ci-image
|
||||
- put: spring-boot-jdk11-ci-image
|
||||
params:
|
||||
build: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image
|
||||
- put: spring-boot-jdk12-ci-image
|
||||
params:
|
||||
build: ci-images-git-repo/ci/images/spring-boot-jdk12-ci-image
|
||||
- name: build
|
||||
serial: true
|
||||
public: true
|
||||
@ -245,98 +242,6 @@ jobs:
|
||||
params:
|
||||
path: git-repo
|
||||
status: failure
|
||||
- name: jdk9-build
|
||||
serial: true
|
||||
public: true
|
||||
plan:
|
||||
- get: spring-boot-jdk9-ci-image
|
||||
- get: git-repo
|
||||
trigger: true
|
||||
- put: repo-status-jdk9-build
|
||||
params: { state: "pending", commit: "git-repo" }
|
||||
- do:
|
||||
- task: build-project
|
||||
privileged: true
|
||||
timeout: 1h30m
|
||||
image: spring-boot-jdk9-ci-image
|
||||
file: git-repo/ci/tasks/build-project.yml
|
||||
- aggregate:
|
||||
- task: build-samples
|
||||
timeout: 1h30m
|
||||
image: spring-boot-jdk9-ci-image
|
||||
file: git-repo/ci/tasks/build-samples.yml
|
||||
- task: build-integration-tests
|
||||
timeout: 1h30m
|
||||
image: spring-boot-jdk9-ci-image
|
||||
file: git-repo/ci/tasks/build-integration-tests.yml
|
||||
- task: build-deployment-tests
|
||||
timeout: 1h30m
|
||||
image: spring-boot-jdk9-ci-image
|
||||
file: git-repo/ci/tasks/build-deployment-tests.yml
|
||||
on_failure:
|
||||
do:
|
||||
- put: repo-status-jdk9-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-jdk9-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: jdk10-build
|
||||
serial: true
|
||||
public: true
|
||||
plan:
|
||||
- get: spring-boot-jdk10-ci-image
|
||||
- get: git-repo
|
||||
trigger: true
|
||||
- put: repo-status-jdk10-build
|
||||
params: { state: "pending", commit: "git-repo" }
|
||||
- do:
|
||||
- task: build-project
|
||||
privileged: true
|
||||
timeout: 1h30m
|
||||
image: spring-boot-jdk10-ci-image
|
||||
file: git-repo/ci/tasks/build-project.yml
|
||||
- aggregate:
|
||||
- task: build-samples
|
||||
timeout: 1h30m
|
||||
image: spring-boot-jdk10-ci-image
|
||||
file: git-repo/ci/tasks/build-samples.yml
|
||||
- task: build-integration-tests
|
||||
timeout: 1h30m
|
||||
image: spring-boot-jdk10-ci-image
|
||||
file: git-repo/ci/tasks/build-integration-tests.yml
|
||||
- task: build-deployment-tests
|
||||
timeout: 1h30m
|
||||
image: spring-boot-jdk10-ci-image
|
||||
file: git-repo/ci/tasks/build-deployment-tests.yml
|
||||
on_failure:
|
||||
do:
|
||||
- put: repo-status-jdk10-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-jdk10-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: jdk11-build
|
||||
serial: true
|
||||
public: true
|
||||
@ -383,6 +288,52 @@ 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: 1h30m
|
||||
image: spring-boot-jdk12-ci-image
|
||||
file: git-repo/ci/tasks/build-project.yml
|
||||
- aggregate:
|
||||
- task: build-samples
|
||||
timeout: 1h30m
|
||||
image: spring-boot-jdk12-ci-image
|
||||
file: git-repo/ci/tasks/build-samples.yml
|
||||
- task: build-integration-tests
|
||||
timeout: 1h30m
|
||||
image: spring-boot-jdk12-ci-image
|
||||
file: git-repo/ci/tasks/build-integration-tests.yml
|
||||
- task: build-deployment-tests
|
||||
timeout: 1h30m
|
||||
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: stage-milestone
|
||||
serial: true
|
||||
plan:
|
||||
@ -563,7 +514,7 @@ jobs:
|
||||
BINTRAY_REPO: ((bintray-repo))
|
||||
groups:
|
||||
- name: "Build"
|
||||
jobs: ["build", "jdk9-build", "jdk10-build", "jdk11-build"]
|
||||
jobs: ["build", "jdk11-build", "jdk12-build"]
|
||||
- name: "Release"
|
||||
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"]
|
||||
- name: "CI Images"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user