Browse Source

Update Java version for compatibility tests in CI

This commit configures Java 20 for compatibility tests in our CI,
replacing Java 19.
pull/30183/head
Brian Clozel 3 years ago
parent
commit
d9776941bf
  1. 2
      ci/images/ci-image/Dockerfile
  2. 4
      ci/images/get-jdk-url.sh
  3. 2
      ci/images/setup.sh
  4. 16
      ci/pipeline.yml
  5. 2
      spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java

2
ci/images/ci-image/Dockerfile

@ -6,6 +6,6 @@ RUN ./setup.sh @@ -6,6 +6,6 @@ RUN ./setup.sh
ENV JAVA_HOME /opt/openjdk/java17
ENV JDK17 /opt/openjdk/java17
ENV JDK19 /opt/openjdk/java19
ENV JDK20 /opt/openjdk/java20
ENV PATH $JAVA_HOME/bin:$PATH

4
ci/images/get-jdk-url.sh

@ -5,8 +5,8 @@ case "$1" in @@ -5,8 +5,8 @@ case "$1" in
java17)
echo "https://github.com/bell-sw/Liberica/releases/download/17.0.6+10/bellsoft-jdk17.0.6+10-linux-amd64.tar.gz"
;;
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://github.com/bell-sw/Liberica/releases/download/20%2B37/bellsoft-jdk20+37-linux-amd64.tar.gz"
;;
*)
echo $"Unknown java version"

2
ci/images/setup.sh

@ -20,7 +20,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/c @@ -20,7 +20,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/c
mkdir -p /opt/openjdk
pushd /opt/openjdk > /dev/null
for jdk in java17 java19
for jdk in java17 java20
do
JDK_URL=$( /get-jdk-url.sh $jdk )
mkdir $jdk

16
ci/pipeline.yml

@ -127,14 +127,14 @@ resources: @@ -127,14 +127,14 @@ resources:
access_token: ((github-ci-status-token))
branch: ((branch))
context: build
- name: repo-status-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: jdk19-build
context: jdk20-build
- name: slack-alert
type: slack-notification
icon: slack
@ -231,7 +231,7 @@ jobs: @@ -231,7 +231,7 @@ jobs:
"zip.type": "schema"
get_params:
threads: 8
- name: jdk19-build
- name: jdk20-build
serial: true
public: true
plan:
@ -239,7 +239,7 @@ jobs: @@ -239,7 +239,7 @@ jobs:
- get: git-repo
- get: every-morning
trigger: true
- put: repo-status-jdk19-build
- put: repo-status-jdk20-build
params: { state: "pending", commit: "git-repo" }
- do:
- task: check-project
@ -248,16 +248,16 @@ jobs: @@ -248,16 +248,16 @@ jobs:
privileged: true
timeout: ((task-timeout))
params:
TEST_TOOLCHAIN: 19
TEST_TOOLCHAIN: 20
<<: *build-project-task-params
on_failure:
do:
- put: repo-status-jdk19-build
- put: repo-status-jdk20-build
params: { state: "failure", commit: "git-repo" }
- put: slack-alert
params:
<<: *slack-fail-params
- put: repo-status-jdk19-build
- put: repo-status-jdk20-build
params: { state: "success", commit: "git-repo" }
- name: build-pull-requests
serial: true
@ -441,7 +441,7 @@ jobs: @@ -441,7 +441,7 @@ jobs:
groups:
- name: "builds"
jobs: ["build", "jdk19-build"]
jobs: ["build", "jdk20-build"]
- name: "releases"
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
- name: "ci-images"

2
spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java

@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
* @author Sam Brannen
* @since 5.2.4
*/
@DisabledOnJre(value= {JRE.JAVA_18, JRE.JAVA_19}, disabledReason = "BlockHound is not compatible with Java 18+")
@DisabledOnJre(value= {JRE.JAVA_18, JRE.JAVA_19, JRE.JAVA_20}, disabledReason = "BlockHound is not compatible with Java 18+")
class SpringCoreBlockHoundIntegrationTests {
@BeforeAll

Loading…
Cancel
Save