From 9e3af0c9fdf589bfefa6c8343fe0bd8d1a5b0e39 Mon Sep 17 00:00:00 2001 From: Rahul Mohanan Date: Sat, 31 May 2025 12:10:24 +0530 Subject: [PATCH] Move 4.36-I builds to R4_36_maintenance branch https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/3073 --- .../Builds/DockerImagesBuild.jenkinsfile | 4 +-- JenkinsJobs/Builds/FOLDER.groovy | 4 +-- JenkinsJobs/Builds/build.jenkinsfile | 2 +- JenkinsJobs/JobDSL.json | 2 +- cje-production/buildproperties.txt | 2 +- .../repositories_R4_36_maintenance.txt | 13 +++++++ .../streams/repositories_java25.txt | 36 +++++++++---------- .../streams/repositories_master.txt | 13 ------- 8 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 cje-production/streams/repositories_R4_36_maintenance.txt delete mode 100644 cje-production/streams/repositories_master.txt diff --git a/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile b/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile index e6816c4d926..7660821b538 100644 --- a/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile +++ b/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile @@ -14,8 +14,8 @@ pipeline { steps { cleanWs() sh ''' - git clone --depth=1 -b master https://github.com/eclipse-platform/eclipse.platform.releng.aggregator.git - git clone --depth=1 -b master https://github.com/eclipse-jdt/eclipse.jdt.core + git clone --depth=1 -b R4_36_maintenance https://github.com/eclipse-platform/eclipse.platform.releng.aggregator.git + git clone --depth=1 -b R4_36_maintenance https://github.com/eclipse-jdt/eclipse.jdt.core ''' } } diff --git a/JenkinsJobs/Builds/FOLDER.groovy b/JenkinsJobs/Builds/FOLDER.groovy index 199ca337e05..717eb042c6e 100644 --- a/JenkinsJobs/Builds/FOLDER.groovy +++ b/JenkinsJobs/Builds/FOLDER.groovy @@ -19,7 +19,7 @@ for (STREAM in config.Streams){ # - - - Integration Eclipse SDK builds - - - # 2025-06 Release Schedule # Normal : 6 PM every day (1/6 - 2/9) -0 18 * * * +# 0 18 * * * # RC Schedule @@ -57,7 +57,7 @@ pipelineJob('Builds/Build-Docker-images'){ cpsScm { lightweight(true) scm { - github('eclipse-platform/eclipse.platform.releng.aggregator', 'master') + github('eclipse-platform/eclipse.platform.releng.aggregator', 'R4_36_maintenance') } scriptPath('JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile') } diff --git a/JenkinsJobs/Builds/build.jenkinsfile b/JenkinsJobs/Builds/build.jenkinsfile index 64b43629789..97e9f464aa4 100644 --- a/JenkinsJobs/Builds/build.jenkinsfile +++ b/JenkinsJobs/Builds/build.jenkinsfile @@ -18,7 +18,7 @@ def BUILD = { def buildConfig = [ type: matcher.group('type'), testPrefix: "ep${matcher.group('major')}${matcher.group('minor')}${matcher.group('type')}-unit"] switch(buildConfig.type) { case 'I': return [*:buildConfig, - typeName: 'Integration' , branchLabel: 'master', + typeName: 'Integration' , branchLabel: 'R4_36_maintenance', mailingList: 'platform-releng-dev@eclipse.org', testJobFolder:'AutomatedTests', testConfigurations: I_TEST_CONFIGURATIONS] case 'Y': return [*:buildConfig, typeName: 'Beta Java 25', branchLabel: 'java25', diff --git a/JenkinsJobs/JobDSL.json b/JenkinsJobs/JobDSL.json index 7e27a9f1296..630aa9ce22b 100644 --- a/JenkinsJobs/JobDSL.json +++ b/JenkinsJobs/JobDSL.json @@ -3,6 +3,6 @@ "4.36" ], "Branches": { - "4.36": "master" + "4.36": "R4_36_maintenance" } } diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt index 1ecfda491db..2af549992c6 100644 --- a/cje-production/buildproperties.txt +++ b/cje-production/buildproperties.txt @@ -17,7 +17,7 @@ # with # are considered comments and no spaces allowed in keys # CJE build variables -BRANCH="master" +BRANCH="R4_36_maintenance" RELEASE_VER="4.36" STREAM="4.36.0" STREAMMajor="4" diff --git a/cje-production/streams/repositories_R4_36_maintenance.txt b/cje-production/streams/repositories_R4_36_maintenance.txt new file mode 100644 index 00000000000..a8e1b8be29b --- /dev/null +++ b/cje-production/streams/repositories_R4_36_maintenance.txt @@ -0,0 +1,13 @@ +equinox.binaries: R4_36_maintenance +equinox: R4_36_maintenance +equinox.p2: R4_36_maintenance +eclipse.jdt.core.binaries: R4_36_maintenance +eclipse.jdt.core: R4_36_maintenance +eclipse.jdt.debug: R4_36_maintenance +eclipse.jdt: R4_36_maintenance +eclipse.jdt.ui: R4_36_maintenance +eclipse.pde: R4_36_maintenance +eclipse.platform: R4_36_maintenance +eclipse.platform.releng: R4_36_maintenance +eclipse.platform.swt: R4_36_maintenance +eclipse.platform.ui: R4_36_maintenance \ No newline at end of file diff --git a/cje-production/streams/repositories_java25.txt b/cje-production/streams/repositories_java25.txt index 18600a59005..3701e4eb325 100644 --- a/cje-production/streams/repositories_java25.txt +++ b/cje-production/streams/repositories_java25.txt @@ -1,21 +1,21 @@ -equinox.binaries: master -equinox: master -equinox.p2: master -eclipse.jdt: master -eclipse.jdt.core.binaries: master +equinox.binaries: R4_36_maintenance +equinox: R4_36_maintenance +equinox.p2: R4_36_maintenance +eclipse.jdt: R4_36_maintenance +eclipse.jdt.core.binaries: R4_36_maintenance eclipse.jdt.core: BETA_JAVA25 eclipse.jdt.debug: BETA_JAVA25 eclipse.jdt.ui: BETA_JAVA25 -eclipse.pde: master -eclipse.platform.debug: master -eclipse.platform.resources: master -eclipse.platform: master -eclipse.platform.common: master -eclipse.platform.releng: master -eclipse.platform.runtime: master -eclipse.platform.swt: master -eclipse.platform.team: master -eclipse.platform.text: master -eclipse.platform.ua: master -eclipse.platform.ui: master -eclipse.platform.ui.tools: master +eclipse.pde: R4_36_maintenance +eclipse.platform.debug: R4_36_maintenance +eclipse.platform.resources: R4_36_maintenance +eclipse.platform: R4_36_maintenance +eclipse.platform.common: R4_36_maintenance +eclipse.platform.releng: R4_36_maintenance +eclipse.platform.runtime: R4_36_maintenance +eclipse.platform.swt: R4_36_maintenance +eclipse.platform.team: R4_36_maintenance +eclipse.platform.text: R4_36_maintenance +eclipse.platform.ua: R4_36_maintenance +eclipse.platform.ui: R4_36_maintenance +eclipse.platform.ui.tools: R4_36_maintenance \ No newline at end of file diff --git a/cje-production/streams/repositories_master.txt b/cje-production/streams/repositories_master.txt deleted file mode 100644 index f2cdaaeb39a..00000000000 --- a/cje-production/streams/repositories_master.txt +++ /dev/null @@ -1,13 +0,0 @@ -equinox.binaries: master -equinox: master -equinox.p2: master -eclipse.jdt.core.binaries: master -eclipse.jdt.core: master -eclipse.jdt.debug: master -eclipse.jdt: master -eclipse.jdt.ui: master -eclipse.pde: master -eclipse.platform: master -eclipse.platform.releng: master -eclipse.platform.swt: master -eclipse.platform.ui: master