Skip to content

Commit 797690f

Browse files
committed
[Build] Rename JobDSL.json to buildConfigurations.json
to better reflect the purpose and content of that file. It contains the configuration of the I/Y-builds and will be extended in subsequent changes.
1 parent dae1494 commit 797690f

File tree

8 files changed

+14
-12
lines changed

8 files changed

+14
-12
lines changed

JenkinsJobs/AutomatedTests/I_unit_tests.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('JobDSL.json'))
1+
def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('buildConfigurations.json'))
22

33
def TEST_CONFIGURATIONS = [
44
[os: 'linux' , ws:'gtk' , arch: 'x86_64' , javaVersion: 21, agentLabel: 'ubuntu-2404' , javaHome: "tool(type:'jdk', name:'temurin-jdk21-latest')" ],

JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ pipeline {
196196
"for ${PREVIOUS_RELEASE_VERSION}.0 builds" : "for ${NEXT_RELEASE_VERSION}.0 builds",
197197
])
198198
script {
199-
utilities.modifyJSON('JenkinsJobs/JobDSL.json') { builds ->
199+
utilities.modifyJSON('JenkinsJobs/buildConfigurations.json') { builds ->
200200
// Create I-build for new stream and move previous I-build to maintenance branch to allow late re-spins
201201
builds.I.streams["${NEXT_RELEASE_VERSION}"] = [ branch: 'master', schedule: env.I_BUILD_SCHEDULE ]
202202
builds.I.streams["${PREVIOUS_RELEASE_VERSION}"].branch = env.MAINTENANCE_BRANCH
@@ -278,7 +278,7 @@ pipeline {
278278
sh 'git checkout -b prepareMaintenance ${MAINTENANCE_BRANCH}'
279279

280280
script {
281-
utilities.modifyJSON('JenkinsJobs/JobDSL.json') { builds ->
281+
utilities.modifyJSON('JenkinsJobs/buildConfigurations.json') { builds ->
282282
builds.values().each{ buildType ->
283283
def build = buildType.streams["${PREVIOUS_RELEASE_VERSION}"]
284284
build.branch = env.MAINTENANCE_BRANCH

JenkinsJobs/Releng/promoteBuild.jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ pipeline {
234234
'previousReleaseVersion=.*' : "previousReleaseVersion=${BUILD_MAJOR}.${BUILD_MINOR}",
235235
'previousReleaseVersionRepo=.*' : "previousReleaseVersionRepo=${BUILD_MAJOR}.${BUILD_MINOR}",
236236
])
237-
utilities.modifyJSON('JenkinsJobs/JobDSL.json') { builds ->
237+
utilities.modifyJSON('JenkinsJobs/buildConfigurations.json') { builds ->
238238
// Remove old I/Y-build jobs for this release
239239
builds.values().each{ build -> build.streams.remove("${BUILD_MAJOR}.${BUILD_MINOR}") }
240240
}

JenkinsJobs/YBuilds/Y_unit_tests.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('JobDSL.json'))
1+
def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('buildConfigurations.json'))
22

33
def TEST_CONFIGURATIONS = [
44
[os: 'linux' , ws:'gtk' , arch: 'x86_64' , javaVersion: 21, agentLabel: 'ubuntu-2404' , javaHome: "tool(type:'jdk', name:'temurin-jdk21-latest')" ],
File renamed without changes.

JenkinsJobs/seedJob.jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ pipeline {
3737
// Remove the generic 'build' job and define stream specific I/Y-build jobs instead
3838
def buildJob = pipelineJobDefinitions.remove('Builds/build')
3939

40-
def jobConfigurations = readJSON(file: 'JobDSL.json')
41-
jobConfigurations.I.streams.each{ STREAM, config ->
40+
def buildConfigurations = readJSON(file: 'buildConfigurations.json')
41+
buildConfigurations.I.streams.each{ STREAM, config ->
4242
pipelineJobDefinitions["Builds/I-build-${STREAM}"] = [scriptPath: buildJob.scriptPath, branch: config.branch,
4343
description: 'Daily Eclipse Integration builds.', disabled: config.disabled, cronTrigger: config.schedule ? ('''\
4444
TZ=America/Toronto
@@ -47,7 +47,7 @@ pipeline {
4747
# Schedule: 6 PM every day until end of RC2
4848
'''.stripIndent() + config.schedule).trim() : null]
4949
}
50-
jobConfigurations.Y.streams.each{ STREAM, config ->
50+
buildConfigurations.Y.streams.each{ STREAM, config ->
5151
pipelineJobDefinitions["YBuilds/Y-build-${STREAM}"] = [scriptPath: buildJob.scriptPath, branch: config.branch,
5252
description: 'Beta Java Eclipse builds.', disabled: config.disabled, cronTrigger: config.schedule ? ('''\
5353
TZ=America/Toronto

RELENG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ As a general rule, the (JenkinsJobs)[JenkinsJobs] folder should match the layout
1717

1818
Note: JobDSL does also support the creation of Views, so those can be added at some point but someone will either have to manually keep them up to date with the desired jobs or write a script to keep them up-to-date.
1919

20-
Many jobs have the release version in the job name because it is required for results parsing (i.e. the (automated tests)[https://ci.eclipse.org/releng/job/AutomatedTests/]). In order to minimize manual labor the currently active streams are listed in the (JobDSL.json)[JenkinsJobs/JobDSL.json] file. Version dependent jobs then parse this file during creation and make a job for each stream.
20+
Many jobs have the release version in the job name because it is required for results parsing (i.e. the (automated tests)[https://ci.eclipse.org/releng/job/AutomatedTests/]).
21+
In order to minimize manual labor the currently active streams are listed in the (buildConfigurations.json)[JenkinsJobs/buildConfigurations.json] file.
22+
Version dependent jobs then parse this file during creation and make a job for each stream.
2123

2224
**New Jobs**
2325

@@ -53,7 +55,7 @@ When the JDT team is ready they will raise an issue to create new Y builds and s
5355
**Things to Do:**
5456
* Update the Y-build configuration in the (build.jenkinsfile)[JenkinsJobs/Builds/build.jenkinsfile]
5557
- Update `branchLabel` and `typeName` to the name of the new java version
56-
* Remove the disablement of the current stream in the Y-build configuration in the (JobDSL.json)[JenkinsJobs/JobDSL.json] (should be the only Y-build stream).
58+
* Remove the disablement of the current stream in the Y-build configuration in the (buildConfigurations.json)[JenkinsJobs/buildConfigurations.json] (should be the only Y-build stream).
5759
* Update and rename the java repository files in (cje-production/streams)[cje-production/streams]
5860
- Repos without a `BETA_JAVA##` branch should be set to master
5961
* Add unit tests for the new java version in (JenkinsJobs/YBuilds)[JenkinsJobs/YBuilds] and (build.jenkinsfile)[JenkinsJobs/Builds/build.jenkinsfile]

scripts/newReleasePrep.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ TITLE="Preparation work for ${NEXT_STREAM} (${NEXT_TRAIN}) and open master for d
2525
BODY="This preparation work involves the following tasks. For previous bug please refer to eclipse-platform/eclipse.platform.releng.aggregator#${PREV_ISSUE}.
2626
2727
- [ ] Update JenkinsJobs for ${NEXT_STREAM}:
28-
- - [ ] Add ${NEXT_STREAM} to JobDSL.json to create new jobs
29-
- - [ ] Update "Brances" in JobDSL.json to move ${PREV_MAJOR}.${PREV_MINOR}-I builds to R${PREV_MAJOR}_${PREV_MINOR}_maintenance branch
28+
- - [ ] Add ${NEXT_STREAM} to `buildConfigurations.json` to create new jobs
29+
- - [ ] Update "Brances" in `buildConfigurations.json` to move ${PREV_MAJOR}.${PREV_MINOR}-I builds to R${PREV_MAJOR}_${PREV_MINOR}_maintenance branch
3030
- - [ ] Update I-build triggers with dates for ${NEXT_STREAM} milestone
3131
- [ ] Splash Screen for ${NEXT_STREAM} (${NEXT_TRAIN})
3232
- [ ] Create ${NEXT_STREAM}-I-builds repo

0 commit comments

Comments
 (0)