Merge branch '3.0.x'

Closes gh-34641
This commit is contained in:
Andy Wilkinson 2023-03-20 10:13:42 +00:00
commit 2802841de6
3 changed files with 100 additions and 2 deletions

View File

@ -0,0 +1,10 @@
FROM ubuntu:jammy-20230126
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 java20
ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH
ADD docker-lib.sh /docker-lib.sh

View File

@ -8,6 +8,9 @@ case "$1" in
java19)
echo "https://github.com/bell-sw/Liberica/releases/download/19.0.2+9/bellsoft-jdk19.0.2+9-linux-amd64.tar.gz"
;;
java20)
echo "https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz"
;;
*)
echo $"Unknown java version"
exit 1

View File

@ -188,6 +188,12 @@ resources:
source:
<<: *ci-registry-image-resource-source
repository: ((docker-hub-organization))/spring-boot-ci-jdk19
- name: ci-image-jdk20
type: registry-image
icon: docker
source:
<<: *ci-registry-image-resource-source
repository: ((docker-hub-organization))/spring-boot-ci-jdk20
- name: paketo-builder-base-image
type: registry-image
icon: docker
@ -220,6 +226,14 @@ resources:
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk19-build
- name: repo-status-jdk20-build
type: github-status-resource
icon: eye-check-outline
source:
repository: ((github-repo-name))
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk20-build
- name: slack-alert
type: slack-notification
icon: slack
@ -262,6 +276,13 @@ jobs:
image: ci-image-jdk19
vars:
ci-image-name: ci-image-jdk19
- task: build-ci-image-jdk20
privileged: true
file: git-repo/ci/tasks/build-ci-image.yml
output_mapping:
image: ci-image-jdk20
vars:
ci-image-name: ci-image-jdk20
- in_parallel:
- put: ci-image
params:
@ -269,6 +290,9 @@ jobs:
- put: ci-image-jdk19
params:
image: ci-image-jdk19/image.tar
- put: ci-image-jdk20
params:
image: ci-image-jdk20/image.tar
- name: detect-jdk-updates
plan:
- get: git-repo
@ -407,6 +431,38 @@ jobs:
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk20-build
serial: true
public: true
plan:
- get: ci-image-jdk20
- get: git-repo
trigger: true
- put: repo-status-jdk20-build
params: { state: "pending", commit: "git-repo" }
- do:
- task: build-project
image: ci-image-jdk20
privileged: true
timeout: ((task-timeout))
file: git-repo/ci/tasks/build-project.yml
params:
BRANCH: ((branch))
TOOLCHAIN_JAVA_VERSION: 20
<<: *gradle-enterprise-task-params
<<: *docker-hub-task-params
on_failure:
do:
- put: repo-status-jdk20-build
params: { state: "failure", commit: "git-repo" }
- put: slack-alert
params:
<<: *slack-fail-params
- put: repo-status-jdk20-build
params: { state: "success", commit: "git-repo" }
- put: slack-alert
params:
<<: *slack-success-params
- name: windows-build
serial: true
plan:
@ -703,13 +759,42 @@ jobs:
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk20-run-system-tests
serial: true
public: true
plan:
- get: ci-image-jdk20
- get: git-repo
- get: paketo-builder-base-image
trigger: true
- get: daily
trigger: true
- do:
- task: run-system-tests
image: ci-image-jdk20
privileged: true
timeout: ((task-timeout))
file: git-repo/ci/tasks/run-system-tests.yml
params:
BRANCH: ((branch))
TOOLCHAIN_JAVA_VERSION: 20
<<: *gradle-enterprise-task-params
<<: *docker-hub-task-params
on_failure:
do:
- put: slack-alert
params:
<<: *slack-fail-params
- put: slack-alert
params:
<<: *slack-success-params
groups:
- name: "builds"
jobs: ["build", "jdk19-build", "windows-build"]
jobs: ["build", "jdk19-build", "jdk20-build", "windows-build"]
- name: "releases"
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release", "publish-gradle-plugin", "publish-to-sdkman", "update-homebrew-tap"]
- name: "system-tests"
jobs: ["run-system-tests", "jdk19-run-system-tests"]
jobs: ["run-system-tests", "jdk19-run-system-tests", "jdk20-run-system-tests"]
- name: "ci-images"
jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"]
- name: "pull-requests"