Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
cdfefa15
Commit
cdfefa15
authored
Nov 04, 2019
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #18848 from dreis2211
* pr/18848: Drop JDK 12-based CI Closes gh-18848
parents
6fbac04e
f9cb7c62
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
94 deletions
+1
-94
get-jdk-url.sh
ci/images/get-jdk-url.sh
+0
-3
Dockerfile
ci/images/spring-boot-jdk12-ci-image/Dockerfile
+0
-11
pipeline.yml
ci/pipeline.yml
+1
-76
detect-jdk-updates.sh
ci/scripts/detect-jdk-updates.sh
+0
-4
No files found.
ci/images/get-jdk-url.sh
View file @
cdfefa15
...
@@ -8,9 +8,6 @@ case "$1" in
...
@@ -8,9 +8,6 @@ case "$1" in
java11
)
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"
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"
echo
$"Unknown java version"
exit
1
exit
1
...
...
ci/images/spring-boot-jdk12-ci-image/Dockerfile
deleted
100644 → 0
View file @
6fbac04e
FROM
ubuntu:bionic-20190807
ADD
setup.sh /setup.sh
ADD
get-jdk-url.sh /get-jdk-url.sh
RUN
./setup.sh java12
ENV
JAVA_HOME /opt/openjdk
ENV
PATH $JAVA_HOME/bin:$PATH
ADD
docker-lib.sh /docker-lib.sh
ENTRYPOINT
[ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]
ci/pipeline.yml
View file @
cdfefa15
...
@@ -85,14 +85,6 @@ resources:
...
@@ -85,14 +85,6 @@ resources:
username
:
((docker-hub-username))
username
:
((docker-hub-username))
password
:
((docker-hub-password))
password
:
((docker-hub-password))
tag
:
((branch))
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
-
name
:
artifactory-repo
type
:
artifactory-resource
type
:
artifactory-resource
icon
:
package-variant
icon
:
package-variant
...
@@ -117,14 +109,6 @@ resources:
...
@@ -117,14 +109,6 @@ resources:
access_token
:
((github-ci-status-token))
access_token
:
((github-ci-status-token))
branch
:
((branch))
branch
:
((branch))
context
:
jdk11-build
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
-
name
:
slack-alert
type
:
slack-notification
type
:
slack-notification
icon
:
slack
icon
:
slack
...
@@ -153,10 +137,6 @@ jobs:
...
@@ -153,10 +137,6 @@ jobs:
params
:
params
:
build
:
ci-images-git-repo/ci/images
build
:
ci-images-git-repo/ci/images
dockerfile
:
ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image/Dockerfile
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
-
name
:
detect-jdk-updates
plan
:
plan
:
-
get
:
git-repo
-
get
:
git-repo
...
@@ -182,15 +162,6 @@ jobs:
...
@@ -182,15 +162,6 @@ jobs:
GITHUB_USERNAME
:
((github-username))
GITHUB_USERNAME
:
((github-username))
JDK_VERSION
:
java11
JDK_VERSION
:
java11
image
:
spring-boot-ci-image
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
-
name
:
build
serial
:
true
serial
:
true
public
:
true
public
:
true
...
@@ -347,52 +318,6 @@ jobs:
...
@@ -347,52 +318,6 @@ jobs:
silent
:
true
silent
:
true
icon_emoji
:
"
:concourse:"
icon_emoji
:
"
:concourse:"
username
:
concourse-ci
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
-
name
:
windows-build
serial
:
true
serial
:
true
plan
:
plan
:
...
@@ -595,7 +520,7 @@ jobs:
...
@@ -595,7 +520,7 @@ jobs:
body
:
generated-release-notes/release-notes.md
body
:
generated-release-notes/release-notes.md
groups
:
groups
:
-
name
:
"
Build"
-
name
:
"
Build"
jobs
:
[
"
build"
,
"
jdk11-build"
,
"
jdk12-build"
,
"
windows-build"
]
jobs
:
[
"
build"
,
"
jdk11-build"
,
"
windows-build"
]
-
name
:
"
Release"
-
name
:
"
Release"
jobs
:
[
"
stage-milestone"
,
"
stage-rc"
,
"
stage-release"
,
"
promote-milestone"
,
"
promote-rc"
,
"
promote-release"
,
"
sync-to-maven-central"
]
jobs
:
[
"
stage-milestone"
,
"
stage-rc"
,
"
stage-release"
,
"
promote-milestone"
,
"
promote-rc"
,
"
promote-release"
,
"
sync-to-maven-central"
]
-
name
:
"
CI
Images"
-
name
:
"
CI
Images"
...
...
ci/scripts/detect-jdk-updates.sh
View file @
cdfefa15
...
@@ -9,10 +9,6 @@ case "$JDK_VERSION" in
...
@@ -9,10 +9,6 @@ case "$JDK_VERSION" in
BASE_URL
=
"https://api.adoptopenjdk.net/v2/info/releases/openjdk11"
BASE_URL
=
"https://api.adoptopenjdk.net/v2/info/releases/openjdk11"
ISSUE_TITLE
=
"Upgrade Java 11 version in CI image"
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"
echo
$"Unknown java version"
exit
1
;
exit
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment