Skip to content

Commit

Permalink
Revert addition of JDK-12 based CI
Browse files Browse the repository at this point in the history
  • Loading branch information
wilkinsona committed Nov 1, 2018
1 parent e9124fa commit 8d701e6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 97 deletions.
33 changes: 0 additions & 33 deletions ci/images/spring-boot-jdk12-ci-image/Dockerfile

This file was deleted.

65 changes: 1 addition & 64 deletions ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,6 @@ resources:
username: ((docker-hub-username))
password: ((docker-hub-password))
tag: ((branch))
- name: spring-boot-jdk12-ci-image
type: docker-image
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
source:
Expand All @@ -101,13 +94,6 @@ resources:
access_token: ((github-access-token))
branch: ((branch))
context: jdk11-build
- name: repo-status-jdk12-build
type: github-status-resource
source:
repository: ((github-repo-name))
access_token: ((github-access-token))
branch: ((branch))
context: jdk12-build
- name: slack-alert
type: slack-notification
source:
Expand All @@ -123,9 +109,6 @@ jobs:
- 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
Expand Down Expand Up @@ -274,52 +257,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: 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:
Expand Down Expand Up @@ -500,7 +437,7 @@ jobs:
BINTRAY_REPO: ((bintray-repo))
groups:
- name: "Build"
jobs: ["build", "jdk11-build", "jdk12-build"]
jobs: ["build", "jdk11-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

0 comments on commit 8d701e6

Please sign in to comment.