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
d89739cc
Commit
d89739cc
authored
Mar 05, 2021
by
dreis2211
Committed by
Andy Wilkinson
Mar 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Java 16 CI pipeline
See gh-25519
parent
3c84ea93
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
94 additions
and
2 deletions
+94
-2
Dockerfile
ci/images/ci-image-jdk16/Dockerfile
+12
-0
get-jdk-url.sh
ci/images/get-jdk-url.sh
+3
-0
setup.sh
ci/images/setup.sh
+9
-0
pipeline.yml
ci/pipeline.yml
+56
-1
build-project.sh
ci/scripts/build-project.sh
+6
-1
detect-jdk-updates.sh
ci/scripts/detect-jdk-updates.sh
+4
-0
get-toolchain-java-version.sh
ci/scripts/get-toolchain-java-version.sh
+4
-0
No files found.
ci/images/ci-image-jdk16/Dockerfile
0 → 100644
View file @
d89739cc
FROM
ubuntu:focal-20210119
ADD
setup.sh /setup.sh
ADD
get-jdk-url.sh /get-jdk-url.sh
ADD
get-docker-url.sh /get-docker-url.sh
RUN
./setup.sh java8 java16
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/images/get-jdk-url.sh
View file @
d89739cc
...
@@ -11,6 +11,9 @@ case "$1" in
...
@@ -11,6 +11,9 @@ case "$1" in
java15
)
java15
)
echo
"https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz"
echo
"https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz"
;;
;;
java16
)
echo
"https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-04-10-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-04-10-39.tar.gz"
;;
*
)
*
)
echo
$"Unknown java version"
echo
$"Unknown java version"
exit
1
exit
1
...
...
ci/images/setup.sh
View file @
d89739cc
...
@@ -26,6 +26,15 @@ curl -L ${JDK_URL} | tar zx --strip-components=1
...
@@ -26,6 +26,15 @@ curl -L ${JDK_URL} | tar zx --strip-components=1
test
-f
/opt/openjdk/bin/java
test
-f
/opt/openjdk/bin/java
test
-f
/opt/openjdk/bin/javac
test
-f
/opt/openjdk/bin/javac
if
[[
$#
-eq
2
]]
;
then
TOOLCHAIN_JDK_URL
=
$(
./get-jdk-url.sh
$2
)
mkdir
-p
/opt/openjdk-toolchain
cd
/opt/openjdk-toolchain
curl
-L
${
TOOLCHAIN_JDK_URL
}
|
tar
zx
--strip-components
=
1
test
-f
/opt/openjdk-toolchain/bin/java
test
-f
/opt/openjdk-toolchain/bin/javac
fi
###########################################################
###########################################################
# DOCKER
# DOCKER
...
...
ci/pipeline.yml
View file @
d89739cc
...
@@ -162,6 +162,12 @@ resources:
...
@@ -162,6 +162,12 @@ resources:
source
:
source
:
<<
:
*registry-image-resource-source
<<
:
*registry-image-resource-source
repository
:
((docker-hub-organization))/spring-boot-ci-jdk15
repository
:
((docker-hub-organization))/spring-boot-ci-jdk15
-
name
:
ci-image-jdk16
type
:
registry-image
icon
:
docker
source
:
<<
:
*registry-image-resource-source
repository
:
((docker-hub-organization))/spring-boot-ci-jdk16
-
name
:
artifactory-repo
-
name
:
artifactory-repo
type
:
artifactory-resource
type
:
artifactory-resource
icon
:
package-variant
icon
:
package-variant
...
@@ -194,6 +200,14 @@ resources:
...
@@ -194,6 +200,14 @@ resources:
access_token
:
((github-ci-status-token))
access_token
:
((github-ci-status-token))
branch
:
((branch))
branch
:
((branch))
context
:
jdk15-build
context
:
jdk15-build
-
name
:
repo-status-jdk16-build
type
:
github-status-resource
icon
:
eye-check-outline
source
:
repository
:
((github-repo-name))
access_token
:
((github-ci-status-token))
branch
:
((branch))
context
:
jdk16-build
-
name
:
slack-alert
-
name
:
slack-alert
type
:
slack-notification
type
:
slack-notification
icon
:
slack
icon
:
slack
...
@@ -243,6 +257,13 @@ jobs:
...
@@ -243,6 +257,13 @@ jobs:
image
:
ci-image-jdk15
image
:
ci-image-jdk15
vars
:
vars
:
ci-image-name
:
ci-image-jdk15
ci-image-name
:
ci-image-jdk15
-
task
:
build-ci-image-jdk16
privileged
:
true
file
:
git-repo/ci/tasks/build-ci-image.yml
output_mapping
:
image
:
ci-image-jdk16
vars
:
ci-image-name
:
ci-image-jdk16
-
in_parallel
:
-
in_parallel
:
-
put
:
ci-image
-
put
:
ci-image
params
:
params
:
...
@@ -253,6 +274,9 @@ jobs:
...
@@ -253,6 +274,9 @@ jobs:
-
put
:
ci-image-jdk15
-
put
:
ci-image-jdk15
params
:
params
:
image
:
ci-image-jdk15/image.tar
image
:
ci-image-jdk15/image.tar
-
put
:
ci-image-jdk16
params
:
image
:
ci-image-jdk16/image.tar
-
name
:
detect-jdk-updates
-
name
:
detect-jdk-updates
plan
:
plan
:
-
get
:
git-repo
-
get
:
git-repo
...
@@ -278,6 +302,12 @@ jobs:
...
@@ -278,6 +302,12 @@ jobs:
params
:
params
:
<<
:
*github-task-params
<<
:
*github-task-params
JDK_VERSION
:
java15
JDK_VERSION
:
java15
-
task
:
detect-jdk16-update
image
:
ci-image
file
:
git-repo/ci/tasks/detect-jdk-updates.yml
params
:
<<
:
*github-task-params
JDK_VERSION
:
java16
-
name
:
detect-ubuntu-image-updates
-
name
:
detect-ubuntu-image-updates
plan
:
plan
:
-
get
:
git-repo
-
get
:
git-repo
...
@@ -415,6 +445,31 @@ jobs:
...
@@ -415,6 +445,31 @@ jobs:
-
put
:
slack-alert
-
put
:
slack-alert
params
:
params
:
<<
:
*slack-success-params
<<
:
*slack-success-params
-
name
:
jdk16-build
serial
:
true
public
:
true
plan
:
-
get
:
ci-image-jdk16
-
get
:
git-repo
trigger
:
true
-
put
:
repo-status-jdk16-build
params
:
{
state
:
"
pending"
,
commit
:
"
git-repo"
}
-
do
:
-
task
:
build-project
image
:
ci-image-jdk16
<<
:
*build-project-task-params
on_failure
:
do
:
-
put
:
repo-status-jdk16-build
params
:
{
state
:
"
failure"
,
commit
:
"
git-repo"
}
-
put
:
slack-alert
params
:
<<
:
*slack-fail-params
-
put
:
repo-status-jdk16-build
params
:
{
state
:
"
success"
,
commit
:
"
git-repo"
}
-
put
:
slack-alert
params
:
<<
:
*slack-success-params
-
name
:
windows-build
-
name
:
windows-build
serial
:
true
serial
:
true
plan
:
plan
:
...
@@ -638,7 +693,7 @@ jobs:
...
@@ -638,7 +693,7 @@ jobs:
repository
:
updated-homebrew-tap-repo
repository
:
updated-homebrew-tap-repo
groups
:
groups
:
-
name
:
"
builds"
-
name
:
"
builds"
jobs
:
[
"
build"
,
"
jdk11-build"
,
"
jdk15-build"
,
"
windows-build"
]
jobs
:
[
"
build"
,
"
jdk11-build"
,
"
jdk15-build"
,
"
jdk16-build"
,
"
windows-build"
]
-
name
:
"
releases"
-
name
:
"
releases"
jobs
:
[
"
stage-milestone"
,
"
stage-rc"
,
"
stage-release"
,
"
promote-milestone"
,
"
promote-rc"
,
"
promote-release"
,
"
create-github-release"
,
"
publish-to-sdkman"
,
"
update-homebrew-tap"
]
jobs
:
[
"
stage-milestone"
,
"
stage-rc"
,
"
stage-release"
,
"
promote-milestone"
,
"
promote-rc"
,
"
promote-release"
,
"
create-github-release"
,
"
publish-to-sdkman"
,
"
update-homebrew-tap"
]
-
name
:
"
ci-images"
-
name
:
"
ci-images"
...
...
ci/scripts/build-project.sh
View file @
d89739cc
...
@@ -5,5 +5,10 @@ source $(dirname $0)/common.sh
...
@@ -5,5 +5,10 @@ source $(dirname $0)/common.sh
repository
=
$(
pwd
)
/distribution-repository
repository
=
$(
pwd
)
/distribution-repository
pushd
git-repo
>
/dev/null
pushd
git-repo
>
/dev/null
./gradlew
-Dorg
.gradle.internal.launcher.welcomeMessageEnabled
=
false
--no-daemon
--max-workers
=
4
-PdeploymentRepository
=
${
repository
}
build publishAllPublicationsToDeploymentRepository
if
[[
-d
/opt/openjdk-toolchain
]]
;
then
toolchain_java_version
=
$(
./
$(
dirname
$0
)
/get-toolchain-java-version.sh
)
./gradlew
-Dorg
.gradle.internal.launcher.welcomeMessageEnabled
=
false
--no-daemon
--max-workers
=
4
-PdeploymentRepository
=
${
repository
}
build publishAllPublicationsToDeploymentRepository
-PtoolchainVersion
=
${
toolchain_java_version
}
-Porg
.gradle.java.installations.auto-detect
=
false
-Porg
.gradle.java.installations.auto-download
=
false
-Porg
.gradle.java.installations.paths
=
/opt/openjdk-toolchain/
else
./gradlew
-Dorg
.gradle.internal.launcher.welcomeMessageEnabled
=
false
--no-daemon
--max-workers
=
4
-PdeploymentRepository
=
${
repository
}
build publishAllPublicationsToDeploymentRepository
fi
popd
>
/dev/null
popd
>
/dev/null
ci/scripts/detect-jdk-updates.sh
View file @
d89739cc
...
@@ -20,6 +20,10 @@ case "$JDK_VERSION" in
...
@@ -20,6 +20,10 @@ case "$JDK_VERSION" in
BASE_URL
=
"https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga"
BASE_URL
=
"https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga"
ISSUE_TITLE
=
"Upgrade Java 15 version in CI image"
ISSUE_TITLE
=
"Upgrade Java 15 version in CI image"
;;
;;
java16
)
BASE_URL
=
"https://api.adoptopenjdk.net/v3/assets/feature_releases/16/ea"
ISSUE_TITLE
=
"Upgrade Java 16 version in CI image"
;;
*
)
*
)
echo
$"Unknown java version"
echo
$"Unknown java version"
exit
1
;
exit
1
;
...
...
ci/scripts/get-toolchain-java-version.sh
0 → 100755
View file @
d89739cc
#!/bin/bash
set
-e
/opt/openjdk-toolchain/bin/java
-XshowSettings
:properties
-version
2>&1 |
grep
"java.specification.version"
|
awk
'{split($0,parts,"="); print parts[2]}'
|
awk
'{$1=$1;print}'
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