Skip to content

Commit

Permalink
Retire nightly jdk19 builds and replace with jdk20 (#628)
Browse files Browse the repository at this point in the history
Also includes a few formatting changes for tidiness.

Signed-off-by: Adam Farley <[email protected]>
  • Loading branch information
adamfarley authored Feb 27, 2023
1 parent ff34e89 commit 5565394
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/comment-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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,19"
To run full set of tests, use "run tests"; a subset of tests on specific jdk version, use "run tests quick 11,20"
70 changes: 35 additions & 35 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/generateBuildMatrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Generates markdown table of build job status

allPlatforms=("jdk8u" "jdk11u" "jdk17u" "jdk19u" "jdk")
allPlatforms=("jdk8u" "jdk11u" "jdk17u" "jdk20" "jdk")
buildFile="/tmp/build.txt"
buildJobFile="/tmp/build_jobs.txt"
excludedKeywords=("SmokeTests" "hotspot" "corretto" "bisheng" "dragonwell" "openj9")
Expand Down
2 changes: 1 addition & 1 deletion pipelines/build/common/build_base_file.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,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/jdk19u/jdk19u-release-aix-ppc64-temurin
release: build-scripts/jobs/release/jobs/jdk20/jdk20-release-aix-ppc64-temurin
*/
def getJobFolder() {
def parentDir = currentBuild.fullProjectName.substring(0, currentBuild.fullProjectName.lastIndexOf('/'))
Expand Down
4 changes: 2 additions & 2 deletions pipelines/build/prTester/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 19`
`run tests quick 11, 19, 8` generates all jobs then runs openjdk pipeline on 8, 11 and 19
`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

##### `add to whitelist`

Expand Down
4 changes: 2 additions & 2 deletions pipelines/build/prTester/pr_test_pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,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,19 run jdk11, 17 and 19
run tests quick 11,17,20 run jdk11, 17 and 20
*/
String[] commentsList = context.params.ghprbCommentBody.trim().split('run tests quick')
switch (commentsList.size()) {
Expand Down Expand Up @@ -207,7 +207,7 @@ Map<String, ?> defaultTestConfigurations = [
]
]

List<Integer> defaultJavaVersions = [8, 11, 17, 19]
List<Integer> defaultJavaVersions = [8, 11, 17, 20]

return {
String branch,
Expand Down
2 changes: 1 addition & 1 deletion pipelines/build/regeneration/build_job_generator.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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/jdk19u/jdk19u-alpine-linux-x64-temurin (when "pr-tester")
- build-scripts-pr-tester/build-test/jobs/jdk20/jdk20-alpine-linux-x64-temurin (when "pr-tester")
*/

String javaVersion = params.JAVA_VERSION
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ node('worker') {
}

timestamps {
def retiredVersions = [9, 10, 12, 13, 14, 15, 16, 18]
def retiredVersions = [9, 10, 12, 13, 14, 15, 16, 18, 19]
def generatedPipelines = []

// Load git url and branch and gitBranch. These determine where we will be pulling user configs from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ node('worker') {
}

timestamps {
def validVersion = [8, 11, 17, 19, 20]
def validVersion = [8, 11, 17, 20]
def generatedPipelines = []

// Load git url and branch and gitBranch. These determine where we will be pulling user configs from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,19]
def releaseVersions = [8,11,17,20]


// Regenerate release-openjdkX-pipeline per each jdk version listed in releaseVersions
Expand Down
4 changes: 2 additions & 2 deletions tools/nightly_build_and_test_stats.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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, 19 ] // Consider making those parameters
def featureReleases = [ 8, 11, 17, 20 ] // 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, 'jdk19': null]
def healthStatus = [ 'jdk8': null, 'jdk11': null, 'jdk17': null, 'jdk20': null]
def testStats = []

stage('getPipelineStatus') {
Expand Down

0 comments on commit 5565394

Please sign in to comment.