From 9cbb52cfa60eb1a79bc0e366001503842412f78c Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Tue, 8 Aug 2023 10:41:16 +0100 Subject: [PATCH] Replacing JDK20 with JDK21 in pipelines (#765) There will be no more JDK20 releases, and JDK21 is next to be released, so this PR does a swap. Also includes some improvements to generateBuildMatrix.sh that makes the code and the output more readable. Signed-off-by: Adam Farley --- .github/workflows/comment-bot.yml | 2 +- README.md | 166 ++++++++++++++++-- docs/generateBuildMatrix.sh | 37 ++-- pipelines/build/common/build_base_file.groovy | 8 +- pipelines/build/prTester/README.md | 4 +- .../build/prTester/pr_test_pipeline.groovy | 4 +- .../regeneration/build_job_generator.groovy | 2 +- .../build_pipeline_generator.groovy | 2 +- .../evaluation_pipeline_generator.groovy | 2 +- .../release_pipeline_generator.groovy | 2 +- pipelines/jobs/configurations/jdk20u.groovy | 2 + tools/nightly_build_and_test_stats.groovy | 4 +- 12 files changed, 192 insertions(+), 43 deletions(-) diff --git a/.github/workflows/comment-bot.yml b/.github/workflows/comment-bot.yml index 4768be9fe..6f1988c20 100644 --- a/.github/workflows/comment-bot.yml +++ b/.github/workflows/comment-bot.yml @@ -32,4 +32,4 @@ jobs: In order to run the advanced [pipeline tests](https://github.com/adoptium/ci-jenkins-pipelines/tree/master/pipelines/build/prTester#openjdk-build-pr-tester) (executing a set of mock pipelines), it requires an admin to post `run tests` on this PR. If you are not an admin, please ask for one's attention in [#infrastructure on Slack](https://adoptium.slack.com/archives/C53GHCXL4) or ping one here. - To run full set of tests, use "run tests"; a subset of tests on specific jdk version, use "run tests quick 11,20" + To run full set of tests, use "run tests"; a subset of tests on specific jdk version, use "run tests quick 11,21" diff --git a/README.md b/README.md index 6ab28b1a0..6a7205768 100644 --- a/README.md +++ b/README.md @@ -372,24 +372,154 @@ The full output generated by `make/autoconf/configure` from the JDK built. ## Build status Table generated with `generateBuildMatrix.sh` + -| Platform | Java 8 | Java 11 | Java 17 | Java 20 | Java HEAD| + +| Platform | Java 8 | Java 11 | Java 17 | Java 21 | Java HEAD | |------|----|----|----|----|----| -| aix-ppc64-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-aix-ppc64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-aix-ppc64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-aix-ppc64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-aix-ppc64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-aix-ppc64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-aix-ppc64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-aix-ppc64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-aix-ppc64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-aix-ppc64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-aix-ppc64-temurin) | -| alpine-linux-aarch64-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-alpine-linux-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-alpine-linux-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-alpine-linux-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-alpine-linux-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-alpine-linux-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-alpine-linux-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-alpine-linux-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-alpine-linux-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-alpine-linux-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-alpine-linux-aarch64-temurin) | -| alpine-linux-x64-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-alpine-linux-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-alpine-linux-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-alpine-linux-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-alpine-linux-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-alpine-linux-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-alpine-linux-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-alpine-linux-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-alpine-linux-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-alpine-linux-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-alpine-linux-x64-temurin) | -| linux-aarch64-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-linux-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-linux-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-linux-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-linux-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-linux-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-linux-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-linux-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-linux-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-aarch64-temurin) | -| linux-arm-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-linux-arm-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-linux-arm-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-linux-arm-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-linux-arm-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-linux-arm-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-linux-arm-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-linux-arm-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-linux-arm-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-arm-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-arm-temurin) | -| linux-ppc64le-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-linux-ppc64le-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-linux-ppc64le-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-linux-ppc64le-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-linux-ppc64le-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-linux-ppc64le-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-linux-ppc64le-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-linux-ppc64le-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-linux-ppc64le-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-ppc64le-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-ppc64le-temurin) | -| linux-s390x-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-linux-s390x-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-linux-s390x-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-linux-s390x-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-linux-s390x-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-linux-s390x-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-linux-s390x-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-linux-s390x-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-linux-s390x-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-s390x-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-s390x-temurin) | -| linux-x64-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-linux-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-linux-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-linux-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-linux-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-linux-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-linux-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-linux-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-linux-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-x64-temurin) | -| mac-aarch64-temurin | N/A | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-mac-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-mac-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-mac-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-mac-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-mac-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-mac-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-mac-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-mac-aarch64-temurin) | -| mac-x64-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-mac-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-mac-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-mac-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-mac-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-mac-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-mac-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-mac-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-mac-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-mac-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-mac-x64-temurin) | -| windows-x64-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-windows-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-windows-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-windows-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-windows-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-windows-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-windows-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-windows-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-windows-x64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-windows-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-windows-x64-temurin) | -| windows-x86-32-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-windows-x86-32-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-windows-x86-32-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-windows-x86-32-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-windows-x86-32-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-windows-x86-32-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-windows-x86-32-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-windows-x86-32-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-windows-x86-32-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-windows-x86-32-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-windows-x86-32-temurin) | -| linux-riscv64-temurin | N/A | N/A | N/A | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk20/jdk20-linux-riscv64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk20/job/jdk20-linux-riscv64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-riscv64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-riscv64-temurin) | -| linux-riscv64-temurin-cross | N/A | N/A | N/A | N/A | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-riscv64-temurin-cross)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-riscv64-temurin-cross) | -| windows-aarch64-temurin | N/A | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-windows-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-windows-aarch64-temurin) | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-windows-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-windows-aarch64-temurin) | N/A | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-windows-aarch64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-windows-aarch64-temurin) | -| solaris-sparcv9-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-solaris-sparcv9-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-solaris-sparcv9-temurin) | N/A | N/A | N/A | N/A | -| solaris-x64-temurin | [![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-solaris-x64-temurin)](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-solaris-x64-temurin) | N/A | N/A | N/A | N/A | +| aix-ppc64-temurin | [![Build Status][i-r1c1]](j-r1c1) | [![Build Status][i-r1c2]](j-r1c2) | [![Build Status][i-r1c3]](j-r1c3) | [![Build Status][i-r1c4]](j-r1c4) | [![Build Status][i-r1c5]](j-r1c5) | +| alpine-linux-aarch64-temurin | [![Build Status][i-r2c1]](j-r2c1) | [![Build Status][i-r2c2]](j-r2c2) | [![Build Status][i-r2c3]](j-r2c3) | N/A | [![Build Status][i-r2c5]](j-r2c5) | +| alpine-linux-x64-temurin | [![Build Status][i-r3c1]](j-r3c1) | [![Build Status][i-r3c2]](j-r3c2) | [![Build Status][i-r3c3]](j-r3c3) | [![Build Status][i-r3c4]](j-r3c4) | [![Build Status][i-r3c5]](j-r3c5) | +| linux-aarch64-temurin | [![Build Status][i-r4c1]](j-r4c1) | [![Build Status][i-r4c2]](j-r4c2) | [![Build Status][i-r4c3]](j-r4c3) | [![Build Status][i-r4c4]](j-r4c4) | [![Build Status][i-r4c5]](j-r4c5) | +| linux-arm-temurin | [![Build Status][i-r5c1]](j-r5c1) | [![Build Status][i-r5c2]](j-r5c2) | [![Build Status][i-r5c3]](j-r5c3) | [![Build Status][i-r5c4]](j-r5c4) | [![Build Status][i-r5c5]](j-r5c5) | +| linux-ppc64le-temurin | [![Build Status][i-r6c1]](j-r6c1) | [![Build Status][i-r6c2]](j-r6c2) | [![Build Status][i-r6c3]](j-r6c3) | [![Build Status][i-r6c4]](j-r6c4) | [![Build Status][i-r6c5]](j-r6c5) | +| linux-riscv64-temurin | N/A | N/A | N/A | N/A | [![Build Status][i-r7c5]](j-r7c5) | +| linux-riscv64-temurin-cross | N/A | N/A | N/A | N/A | [![Build Status][i-r8c5]](j-r8c5) | +| linux-s390x-temurin | [![Build Status][i-r9c1]](j-r9c1) | [![Build Status][i-r9c2]](j-r9c2) | [![Build Status][i-r9c3]](j-r9c3) | [![Build Status][i-r9c4]](j-r9c4) | [![Build Status][i-r9c5]](j-r9c5) | +| linux-x64-temurin | [![Build Status][i-r10c1]](j-r10c1) | [![Build Status][i-r10c2]](j-r10c2) | [![Build Status][i-r10c3]](j-r10c3) | [![Build Status][i-r10c4]](j-r10c4) | [![Build Status][i-r10c5]](j-r10c5) | +| mac-aarch64-temurin | N/A | [![Build Status][i-r11c2]](j-r11c2) | [![Build Status][i-r11c3]](j-r11c3) | [![Build Status][i-r11c4]](j-r11c4) | [![Build Status][i-r11c5]](j-r11c5) | +| mac-x64-temurin | [![Build Status][i-r12c1]](j-r12c1) | [![Build Status][i-r12c2]](j-r12c2) | [![Build Status][i-r12c3]](j-r12c3) | [![Build Status][i-r12c4]](j-r12c4) | [![Build Status][i-r12c5]](j-r12c5) | +| solaris-sparcv9-temurin | [![Build Status][i-r13c1]](j-r13c1) | N/A | N/A | N/A | N/A | +| solaris-x64-temurin | [![Build Status][i-r14c1]](j-r14c1) | N/A | N/A | N/A | N/A | +| windows-aarch64-temurin | N/A | [![Build Status][i-r15c2]](j-r15c2) | [![Build Status][i-r15c3]](j-r15c3) | N/A | [![Build Status][i-r15c5]](j-r15c5) | +| windows-x64-temurin | [![Build Status][i-r16c1]](j-r16c1) | [![Build Status][i-r16c2]](j-r16c2) | [![Build Status][i-r16c3]](j-r16c3) | [![Build Status][i-r16c4]](j-r16c4) | [![Build Status][i-r16c5]](j-r16c5) | +| windows-x86-32-temurin | [![Build Status][i-r17c1]](j-r17c1) | [![Build Status][i-r17c2]](j-r17c2) | [![Build Status][i-r17c3]](j-r17c3) | N/A | N/A | + +[i-r1c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-aix-ppc64-temurin +[j-r1c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-aix-ppc64-temurin +[i-r1c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-aix-ppc64-temurin +[j-r1c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-aix-ppc64-temurin +[i-r1c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-aix-ppc64-temurin +[j-r1c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-aix-ppc64-temurin +[i-r1c4]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk21/jdk21-aix-ppc64-temurin +[j-r1c4]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21/job/jdk21-aix-ppc64-temurin +[i-r1c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-aix-ppc64-temurin +[j-r1c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-aix-ppc64-temurin +[i-r2c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-alpine-linux-aarch64-temurin +[j-r2c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-alpine-linux-aarch64-temurin +[i-r2c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-alpine-linux-aarch64-temurin +[j-r2c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-alpine-linux-aarch64-temurin +[i-r2c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-alpine-linux-aarch64-temurin +[j-r2c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-alpine-linux-aarch64-temurin +[i-r2c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-alpine-linux-aarch64-temurin +[j-r2c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-alpine-linux-aarch64-temurin +[i-r3c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-alpine-linux-x64-temurin +[j-r3c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-alpine-linux-x64-temurin +[i-r3c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-alpine-linux-x64-temurin +[j-r3c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-alpine-linux-x64-temurin +[i-r3c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-alpine-linux-x64-temurin +[j-r3c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-alpine-linux-x64-temurin +[i-r3c4]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk21/jdk21-alpine-linux-x64-temurin +[j-r3c4]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21/job/jdk21-alpine-linux-x64-temurin +[i-r3c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-alpine-linux-x64-temurin +[j-r3c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-alpine-linux-x64-temurin +[i-r4c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-linux-aarch64-temurin +[j-r4c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-linux-aarch64-temurin +[i-r4c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-linux-aarch64-temurin +[j-r4c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-linux-aarch64-temurin +[i-r4c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-linux-aarch64-temurin +[j-r4c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-linux-aarch64-temurin +[i-r4c4]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk21/jdk21-linux-aarch64-temurin +[j-r4c4]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21/job/jdk21-linux-aarch64-temurin +[i-r4c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-aarch64-temurin +[j-r4c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-aarch64-temurin +[i-r5c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-linux-arm-temurin +[j-r5c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-linux-arm-temurin +[i-r5c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-linux-arm-temurin +[j-r5c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-linux-arm-temurin +[i-r5c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-linux-arm-temurin +[j-r5c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-linux-arm-temurin +[i-r5c4]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk21/jdk21-linux-arm-temurin +[j-r5c4]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21/job/jdk21-linux-arm-temurin +[i-r5c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-arm-temurin +[j-r5c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-arm-temurin +[i-r6c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-linux-ppc64le-temurin +[j-r6c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-linux-ppc64le-temurin +[i-r6c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-linux-ppc64le-temurin +[j-r6c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-linux-ppc64le-temurin +[i-r6c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-linux-ppc64le-temurin +[j-r6c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-linux-ppc64le-temurin +[i-r6c4]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk21/jdk21-linux-ppc64le-temurin +[j-r6c4]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21/job/jdk21-linux-ppc64le-temurin +[i-r6c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-ppc64le-temurin +[j-r6c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-ppc64le-temurin +[i-r7c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-riscv64-temurin +[j-r7c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-riscv64-temurin +[i-r8c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-riscv64-temurin-cross +[j-r8c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-riscv64-temurin-cross +[i-r9c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-linux-s390x-temurin +[j-r9c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-linux-s390x-temurin +[i-r9c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-linux-s390x-temurin +[j-r9c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-linux-s390x-temurin +[i-r9c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-linux-s390x-temurin +[j-r9c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-linux-s390x-temurin +[i-r9c4]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk21/jdk21-linux-s390x-temurin +[j-r9c4]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21/job/jdk21-linux-s390x-temurin +[i-r9c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-s390x-temurin +[j-r9c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-s390x-temurin +[i-r10c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-linux-x64-temurin +[j-r10c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-linux-x64-temurin +[i-r10c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-linux-x64-temurin +[j-r10c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-linux-x64-temurin +[i-r10c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-linux-x64-temurin +[j-r10c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-linux-x64-temurin +[i-r10c4]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk21/jdk21-linux-x64-temurin +[j-r10c4]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21/job/jdk21-linux-x64-temurin +[i-r10c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-linux-x64-temurin +[j-r10c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-linux-x64-temurin +[i-r11c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-mac-aarch64-temurin +[j-r11c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-mac-aarch64-temurin +[i-r11c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-mac-aarch64-temurin +[j-r11c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-mac-aarch64-temurin +[i-r11c4]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk21/jdk21-mac-aarch64-temurin +[j-r11c4]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21/job/jdk21-mac-aarch64-temurin +[i-r11c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-mac-aarch64-temurin +[j-r11c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-mac-aarch64-temurin +[i-r12c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-mac-x64-temurin +[j-r12c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-mac-x64-temurin +[i-r12c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-mac-x64-temurin +[j-r12c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-mac-x64-temurin +[i-r12c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-mac-x64-temurin +[j-r12c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-mac-x64-temurin +[i-r12c4]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk21/jdk21-mac-x64-temurin +[j-r12c4]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21/job/jdk21-mac-x64-temurin +[i-r12c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-mac-x64-temurin +[j-r12c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-mac-x64-temurin +[i-r13c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-solaris-sparcv9-temurin +[j-r13c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-solaris-sparcv9-temurin +[i-r14c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-solaris-x64-temurin +[j-r14c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-solaris-x64-temurin +[i-r15c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-windows-aarch64-temurin +[j-r15c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-windows-aarch64-temurin +[i-r15c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-windows-aarch64-temurin +[j-r15c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-windows-aarch64-temurin +[i-r15c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-windows-aarch64-temurin +[j-r15c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-windows-aarch64-temurin +[i-r16c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-windows-x64-temurin +[j-r16c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-windows-x64-temurin +[i-r16c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-windows-x64-temurin +[j-r16c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-windows-x64-temurin +[i-r16c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-windows-x64-temurin +[j-r16c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-windows-x64-temurin +[i-r16c4]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk21/jdk21-windows-x64-temurin +[j-r16c4]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21/job/jdk21-windows-x64-temurin +[i-r16c5]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk/jdk-windows-x64-temurin +[j-r16c5]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk/job/jdk-windows-x64-temurin +[i-r17c1]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk8u/jdk8u-windows-x86-32-temurin +[j-r17c1]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-windows-x86-32-temurin +[i-r17c2]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk11u/jdk11u-windows-x86-32-temurin +[j-r17c2]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-windows-x86-32-temurin +[i-r17c3]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk17u/jdk17u-windows-x86-32-temurin +[j-r17c3]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-windows-x86-32-temurin + diff --git a/docs/generateBuildMatrix.sh b/docs/generateBuildMatrix.sh index 43a596e23..5a0918b6d 100755 --- a/docs/generateBuildMatrix.sh +++ b/docs/generateBuildMatrix.sh @@ -2,18 +2,20 @@ # Generates markdown table of build job status -allPlatforms=("jdk8u" "jdk11u" "jdk17u" "jdk20u" "jdk") +allJdkVersions=("jdk8u" "jdk11u" "jdk17u" "jdk21" "jdk") buildFile="/tmp/build.txt" buildJobFile="/tmp/build_jobs.txt" +buildLinksFile="/tmp/build_links.txt" excludedKeywords=("SmokeTests" "hotspot" "corretto" "bisheng" "dragonwell" "openj9") if [[ -f ${buildFile} ]]; then - echo "Removing previous ${buildFile} ${buildJobFile} files" + echo "Removing previous ${buildFile} ${buildJobFile} ${buildLinksFile} files" rm ${buildFile} rm ${buildJobFile} + rm ${buildLinksFile} fi -for i in ${allPlatforms[@]}; do +for i in ${allJdkVersions[@]}; do curl -s "https://ci.adoptium.net/job/build-scripts/job/jobs/job/${i}/" | egrep -o "job/${i}-[^\/]+" >> ${buildJobFile} done @@ -26,31 +28,46 @@ done echo "This will take a few minutes to complete." # Header row echo -n "| Platform |" > ${buildFile} -for p in ${allPlatforms[@]}; do - echo -n " ${p} |" | sed -e 's/jdk/Java /;s/u//;s/ / HEAD/' >> ${buildFile} +for jdkVersionX in ${allJdkVersions[@]}; do + echo -n " ${jdkVersionX} |" | sed -e 's/jdk/Java /;s/u//;s/ / HEAD /' >> ${buildFile} done # Delimiter row echo -n $'\n|------' >> ${buildFile} # to match Platform column -for i in ${allPlatforms[@]}; do +for i in ${allJdkVersions[@]}; do echo -n "|----" >> ${buildFile} done echo "|" >> ${buildFile} +# Prep buildLinksFile +echo "" >> ${buildLinksFile} + +rowNum=1 + cat ${buildJobFile}| cut -d'/' -f2 | sed -r 's/jdk[0-9]*u?\-//g' | sort | uniq | while read buildName; do # buildName should be of the form: aix-ppc64-temurin echo -n "| ${buildName} | " >> ${buildFile} - for i in ${allPlatforms[@]}; do - code=$(curl -L -s -o /dev/null -w "%{http_code}" "https://ci.adoptium.net/job/build-scripts/job/jobs/job/${i}/job/${i}-${buildName}") + colNum=1 + for jdkVersionX in ${allJdkVersions[@]}; do + jenkinsJobName="${jdkVersionX}-${buildName}" + code=$(curl -L -s -o /dev/null -w "%{http_code}" "https://ci.adoptium.net/job/build-scripts/job/jobs/job/${jdkVersionX}/job/${jenkinsJobName}") if [[ ${code} = 200 ]]; then - echo -n "[![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/${i}/${i}-${buildName})](https://ci.adoptium.net/job/build-scripts/job/jobs/job/${i}/job/${i}-${buildName})" >> "/tmp/build.txt" + echo -n "[![Build Status][i-r${rowNum}c${colNum}]](j-r${rowNum}c${colNum})" >> ${buildFile} + echo "[i-r${rowNum}c${colNum}]: https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/${jdkVersionX}/${jenkinsJobName}" >> ${buildLinksFile} + echo "[j-r${rowNum}c${colNum}]: https://ci.adoptium.net/job/build-scripts/job/jobs/job/${jdkVersionX}/job/${jenkinsJobName}" >> ${buildLinksFile} else echo -n "N/A" >> ${buildFile} fi - echo -n " | " >> ${buildFile} + ((++colNum)) done echo "" >> ${buildFile} + ((++rowNum)) done +cat ${buildLinksFile} >> ${buildFile} + +rm ${buildJobFile} +rm ${buildLinksFile} + echo "Complete - markdown out has been generated in ${buildFile}" diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 99d36e841..a5b350595 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -719,7 +719,7 @@ class Builder implements Serializable { e.g: nightly: build-scripts/jobs/jdk11u/jdk11u-linux-aarch64-temurin evaluation: build-scripts/jobs/evaluation/jobs/jdk17u/jdk17u-evaluation-mac-x64-openj9 - release: build-scripts/jobs/release/jobs/jdk20/jdk20-release-aix-ppc64-temurin + release: build-scripts/jobs/release/jobs/jdk21/jdk21-release-aix-ppc64-temurin */ def getJobFolder() { def parentDir = currentBuild.fullProjectName.substring(0, currentBuild.fullProjectName.lastIndexOf('/')) @@ -828,12 +828,12 @@ class Builder implements Serializable { jobs[configuration.key] = { IndividualBuildConfig config = configuration.value - // jdk20-linux-x64-temurin + // jdk21-linux-x64-temurin def jobTopName = getJobName(configuration.key) def jobFolder = getJobFolder() /* - build-scripts/jobs/jdk20/jdk20-linux-x64-temurin for nightly - build-scripts/evaluation/jobs/jdk20/jdk20-evaluation-linux-aarch64-hotspot for evaluation + build-scripts/jobs/jdk21/jdk21-linux-x64-temurin for nightly + build-scripts/evaluation/jobs/jdk21/jdk21-evaluation-linux-aarch64-hotspot for evaluation */ def downstreamJobName = "${jobFolder}/${jobTopName}" context.echo 'build name ' + downstreamJobName diff --git a/pipelines/build/prTester/README.md b/pipelines/build/prTester/README.md index 560590291..3636ed438 100644 --- a/pipelines/build/prTester/README.md +++ b/pipelines/build/prTester/README.md @@ -77,8 +77,8 @@ If you're unsure if the tests failed because of your changes or not, check our [ Simiar to `run tests` but runs a subset of jdk test jobs. Without specific jdk version, it uses 17, otherwise loops over given versions Example: -`run tests quick` is the same as `run tests quick 20` -`run tests quick 11, 20, 8` generates all jobs then runs openjdk pipeline on 8, 11 and 20 +`run tests quick` is the same as `run tests quick 21` +`run tests quick 11, 21, 8` generates all jobs then runs openjdk pipeline on 8, 11 and 21 ##### `add to whitelist` diff --git a/pipelines/build/prTester/pr_test_pipeline.groovy b/pipelines/build/prTester/pr_test_pipeline.groovy index c0343347f..5721002fa 100644 --- a/pipelines/build/prTester/pr_test_pipeline.groovy +++ b/pipelines/build/prTester/pr_test_pipeline.groovy @@ -134,7 +134,7 @@ class PullRequestTestPipeline implements Serializable { run tests run all version from $javaVersions run tests quick run jdk17 run tests quick 8 run jdk8 - run tests quick 11,17,20 run jdk11, 17 and 20 + run tests quick 11,17,21 run jdk11, 17, and 21 */ String[] commentsList = context.params.ghprbCommentBody.trim().split('run tests quick') switch (commentsList.size()) { @@ -208,7 +208,7 @@ Map defaultTestConfigurations = [ ] ] -List defaultJavaVersions = [8, 11, 17, 20] +List defaultJavaVersions = [8, 11, 17, 21] return { String branch, diff --git a/pipelines/build/regeneration/build_job_generator.groovy b/pipelines/build/regeneration/build_job_generator.groovy index bcdf1f766..4a6962c0c 100644 --- a/pipelines/build/regeneration/build_job_generator.groovy +++ b/pipelines/build/regeneration/build_job_generator.groovy @@ -22,7 +22,7 @@ limitations under the License. - build-scripts/jobs/jdk11u/jdk11u-linux-arm-temurin (jobType = "nightly") - build-scripts/jobs/jdk11u/evaluation-jdk11u-linux-arm-temurin (when jobType = "evaluation") - build-scripts/release/jobs/release-jdk17u-mac-x64-temurin (when jobType = "release") - - build-scripts-pr-tester/build-test/jobs/jdk20/jdk20-alpine-linux-x64-temurin (when "pr-tester") + - build-scripts-pr-tester/build-test/jobs/jdk21/jdk21-alpine-linux-x64-temurin (when "pr-tester") */ String javaVersion = params.JAVA_VERSION diff --git a/pipelines/build/regeneration/build_pipeline_generator.groovy b/pipelines/build/regeneration/build_pipeline_generator.groovy index c2d643ea6..4ad8634fa 100644 --- a/pipelines/build/regeneration/build_pipeline_generator.groovy +++ b/pipelines/build/regeneration/build_pipeline_generator.groovy @@ -48,7 +48,7 @@ node('worker') { } timestamps { - def retiredVersions = [9, 10, 12, 13, 14, 15, 16, 18, 19] + def retiredVersions = [9, 10, 12, 13, 14, 15, 16, 18, 19, 20] def generatedPipelines = [] // Load git url and branch and gitBranch. These determine where we will be pulling user configs from. diff --git a/pipelines/build/regeneration/evaluation_pipeline_generator.groovy b/pipelines/build/regeneration/evaluation_pipeline_generator.groovy index 72b5e6122..e0524ab97 100644 --- a/pipelines/build/regeneration/evaluation_pipeline_generator.groovy +++ b/pipelines/build/regeneration/evaluation_pipeline_generator.groovy @@ -48,7 +48,7 @@ node('worker') { } timestamps { - def retiredVersions = [9, 10, 12, 13, 14, 15, 16, 18, 19] + def retiredVersions = [9, 10, 12, 13, 14, 15, 16, 18, 19, 20] def generatedPipelines = [] // Load git url and branch and gitBranch. These determine where we will be pulling user configs from. diff --git a/pipelines/build/regeneration/release_pipeline_generator.groovy b/pipelines/build/regeneration/release_pipeline_generator.groovy index c63358394..9b6cadd88 100644 --- a/pipelines/build/regeneration/release_pipeline_generator.groovy +++ b/pipelines/build/regeneration/release_pipeline_generator.groovy @@ -7,7 +7,7 @@ file used as jenkinsfile to generator official release pipeline */ // ensure releaseVersions is updated before create releaseTag -def releaseVersions = [8,11,17,20] +def releaseVersions = [8,11,17,21] // Regenerate release-openjdkX-pipeline per each jdk version listed in releaseVersions diff --git a/pipelines/jobs/configurations/jdk20u.groovy b/pipelines/jobs/configurations/jdk20u.groovy index c257641a4..5bd5809b3 100644 --- a/pipelines/jobs/configurations/jdk20u.groovy +++ b/pipelines/jobs/configurations/jdk20u.groovy @@ -46,4 +46,6 @@ weekly_release_scmReferences = [ 'dragonwell' : '' ] +disableJob = true + return this diff --git a/tools/nightly_build_and_test_stats.groovy b/tools/nightly_build_and_test_stats.groovy index 3a778dc07..71d6bcc5d 100644 --- a/tools/nightly_build_and_test_stats.groovy +++ b/tools/nightly_build_and_test_stats.groovy @@ -24,12 +24,12 @@ node('worker') { def trssUrl = "${params.TRSS_URL}" def apiUrl = "${params.API_URL}" def slackChannel = "${params.SLACK_CHANNEL}" - def featureReleases = [ 8, 11, 17, 20, 21 ] // Consider making those parameters + def featureReleases = [ 8, 11, 17, 21 ] // Consider making those parameters def nightlyStaleDays = "${params.MAX_NIGHTLY_STALE_DAYS}" def amberBuildAlertLevel = params.AMBER_BUILD_ALERT_LEVEL ? params.AMBER_BUILD_ALERT_LEVEL as Integer : -99 def amberTestAlertLevel = params.AMBER_TEST_ALERT_LEVEL ? params.AMBER_TEST_ALERT_LEVEL as Integer : -99 - def healthStatus = [ 'jdk8': null, 'jdk11': null, 'jdk17': null, 'jdk20': null, 'jdk21': null ] + def healthStatus = [ 'jdk8': null, 'jdk11': null, 'jdk17': null, 'jdk21': null ] def testStats = [] stage('getPipelineStatus') {