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
e6ebcf14
Commit
e6ebcf14
authored
Sep 22, 2020
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade Java version used in CI from 14 to 15
Closes gh-23433
parent
0edf7cb9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
19 deletions
+19
-19
Dockerfile
ci/images/spring-boot-jdk15-ci-image/Dockerfile
+1
-1
pipeline.yml
ci/pipeline.yml
+18
-18
No files found.
ci/images/spring-boot-jdk1
4
-ci-image/Dockerfile
→
ci/images/spring-boot-jdk1
5
-ci-image/Dockerfile
View file @
e6ebcf14
...
@@ -3,7 +3,7 @@ FROM ubuntu:bionic-20200807
...
@@ -3,7 +3,7 @@ FROM ubuntu:bionic-20200807
ADD
setup.sh /setup.sh
ADD
setup.sh /setup.sh
ADD
get-jdk-url.sh /get-jdk-url.sh
ADD
get-jdk-url.sh /get-jdk-url.sh
ADD
get-docker-url.sh /get-docker-url.sh
ADD
get-docker-url.sh /get-docker-url.sh
RUN
./setup.sh java1
4
RUN
./setup.sh java1
5
ENV
JAVA_HOME /opt/openjdk
ENV
JAVA_HOME /opt/openjdk
ENV
PATH $JAVA_HOME/bin:$PATH
ENV
PATH $JAVA_HOME/bin:$PATH
...
...
ci/pipeline.yml
View file @
e6ebcf14
...
@@ -142,12 +142,12 @@ resources:
...
@@ -142,12 +142,12 @@ resources:
source
:
source
:
<<
:
*docker-resource-source
<<
:
*docker-resource-source
repository
:
((docker-hub-organization))/spring-boot-jdk11-ci-image
repository
:
((docker-hub-organization))/spring-boot-jdk11-ci-image
-
name
:
spring-boot-jdk1
4
-ci-image
-
name
:
spring-boot-jdk1
5
-ci-image
type
:
docker-image
type
:
docker-image
icon
:
docker
icon
:
docker
source
:
source
:
<<
:
*docker-resource-source
<<
:
*docker-resource-source
repository
:
((docker-hub-organization))/spring-boot-jdk1
4
-ci-image
repository
:
((docker-hub-organization))/spring-boot-jdk1
5
-ci-image
-
name
:
artifactory-repo
-
name
:
artifactory-repo
type
:
artifactory-resource
type
:
artifactory-resource
icon
:
package-variant
icon
:
package-variant
...
@@ -172,14 +172,14 @@ resources:
...
@@ -172,14 +172,14 @@ 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-jdk1
4
-build
-
name
:
repo-status-jdk1
5
-build
type
:
github-status-resource
type
:
github-status-resource
icon
:
eye-check-outline
icon
:
eye-check-outline
source
:
source
:
repository
:
((github-repo-name))
repository
:
((github-repo-name))
access_token
:
((github-ci-status-token))
access_token
:
((github-ci-status-token))
branch
:
((branch))
branch
:
((branch))
context
:
jdk1
4
-build
context
:
jdk1
5
-build
-
name
:
slack-alert
-
name
:
slack-alert
type
:
slack-notification
type
:
slack-notification
icon
:
slack
icon
:
slack
...
@@ -210,10 +210,10 @@ jobs:
...
@@ -210,10 +210,10 @@ 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-jdk1
4
-ci-image
-
put
:
spring-boot-jdk1
5
-ci-image
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-jdk1
4
-ci-image/Dockerfile
dockerfile
:
ci-images-git-repo/ci/images/spring-boot-jdk1
5
-ci-image/Dockerfile
-
name
:
detect-jdk-updates
-
name
:
detect-jdk-updates
plan
:
plan
:
-
get
:
git-repo
-
get
:
git-repo
...
@@ -233,12 +233,12 @@ jobs:
...
@@ -233,12 +233,12 @@ jobs:
params
:
params
:
<<
:
*github-task-params
<<
:
*github-task-params
JDK_VERSION
:
java11
JDK_VERSION
:
java11
-
task
:
detect-jdk1
4
-update
-
task
:
detect-jdk1
5
-update
image
:
spring-boot-ci-image
image
:
spring-boot-ci-image
file
:
git-repo/ci/tasks/detect-jdk-updates.yml
file
:
git-repo/ci/tasks/detect-jdk-updates.yml
params
:
params
:
<<
:
*github-task-params
<<
:
*github-task-params
JDK_VERSION
:
java1
4
JDK_VERSION
:
java1
5
-
name
:
detect-ubuntu-image-updates
-
name
:
detect-ubuntu-image-updates
plan
:
plan
:
-
get
:
git-repo
-
get
:
git-repo
...
@@ -400,46 +400,46 @@ jobs:
...
@@ -400,46 +400,46 @@ jobs:
-
put
:
slack-alert
-
put
:
slack-alert
params
:
params
:
<<
:
*slack-success-params
<<
:
*slack-success-params
-
name
:
jdk1
4
-build
-
name
:
jdk1
5
-build
serial
:
true
serial
:
true
public
:
true
public
:
true
plan
:
plan
:
-
get
:
spring-boot-jdk1
4
-ci-image
-
get
:
spring-boot-jdk1
5
-ci-image
-
get
:
git-repo
-
get
:
git-repo
trigger
:
true
trigger
:
true
-
put
:
repo-status-jdk1
4
-build
-
put
:
repo-status-jdk1
5
-build
params
:
{
state
:
"
pending"
,
commit
:
"
git-repo"
}
params
:
{
state
:
"
pending"
,
commit
:
"
git-repo"
}
-
do
:
-
do
:
-
task
:
build-project
-
task
:
build-project
image
:
spring-boot-jdk1
4
-ci-image
image
:
spring-boot-jdk1
5
-ci-image
<<
:
*build-project-task-params
<<
:
*build-project-task-params
-
in_parallel
:
-
in_parallel
:
-
task
:
build-smoke-tests
-
task
:
build-smoke-tests
timeout
:
((task-timeout))
timeout
:
((task-timeout))
image
:
spring-boot-jdk1
4
-ci-image
image
:
spring-boot-jdk1
5
-ci-image
file
:
git-repo/ci/tasks/build-smoke-tests.yml
file
:
git-repo/ci/tasks/build-smoke-tests.yml
params
:
params
:
<<
:
*gradle-enterprise-task-params
<<
:
*gradle-enterprise-task-params
-
task
:
build-integration-tests
-
task
:
build-integration-tests
timeout
:
((task-timeout))
timeout
:
((task-timeout))
image
:
spring-boot-jdk1
4
-ci-image
image
:
spring-boot-jdk1
5
-ci-image
file
:
git-repo/ci/tasks/build-integration-tests.yml
file
:
git-repo/ci/tasks/build-integration-tests.yml
params
:
params
:
<<
:
*gradle-enterprise-task-params
<<
:
*gradle-enterprise-task-params
-
task
:
build-deployment-tests
-
task
:
build-deployment-tests
timeout
:
((task-timeout))
timeout
:
((task-timeout))
image
:
spring-boot-jdk1
4
-ci-image
image
:
spring-boot-jdk1
5
-ci-image
file
:
git-repo/ci/tasks/build-deployment-tests.yml
file
:
git-repo/ci/tasks/build-deployment-tests.yml
params
:
params
:
<<
:
*gradle-enterprise-task-params
<<
:
*gradle-enterprise-task-params
on_failure
:
on_failure
:
do
:
do
:
-
put
:
repo-status-jdk1
4
-build
-
put
:
repo-status-jdk1
5
-build
params
:
{
state
:
"
failure"
,
commit
:
"
git-repo"
}
params
:
{
state
:
"
failure"
,
commit
:
"
git-repo"
}
-
put
:
slack-alert
-
put
:
slack-alert
params
:
params
:
<<
:
*slack-fail-params
<<
:
*slack-fail-params
-
put
:
repo-status-jdk1
4
-build
-
put
:
repo-status-jdk1
5
-build
params
:
{
state
:
"
success"
,
commit
:
"
git-repo"
}
params
:
{
state
:
"
success"
,
commit
:
"
git-repo"
}
-
put
:
slack-alert
-
put
:
slack-alert
params
:
params
:
...
@@ -638,7 +638,7 @@ jobs:
...
@@ -638,7 +638,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"
,
"
jdk1
4
-build"
,
"
windows-build"
]
jobs
:
[
"
build"
,
"
jdk11-build"
,
"
jdk1
5
-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"
...
...
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