diff --git a/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile b/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile index e6816c4d926..8766be1988f 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_37_maintenance https://github.com/eclipse-platform/eclipse.platform.releng.aggregator.git + git clone --depth=1 -b R4_37_maintenance https://github.com/eclipse-jdt/eclipse.jdt.core ''' } } diff --git a/JenkinsJobs/Builds/FOLDER.groovy b/JenkinsJobs/Builds/FOLDER.groovy index 95d5c32a5ff..c7e48d477f8 100644 --- a/JenkinsJobs/Builds/FOLDER.groovy +++ b/JenkinsJobs/Builds/FOLDER.groovy @@ -13,20 +13,7 @@ for (STREAM in config.Streams){ pipelineTriggers { triggers { cron { - spec('''TZ=America/Toronto -# format: Minute Hour Day Month Day of the week (0-7) - -# - - - Integration Eclipse SDK builds - - - -# 2025-09 Release Schedule -# Normal : 6 PM every day (11/6 - 27/8) -0 18 * * * - - -# RC Schedule -# Post M3, no nightlies, I-builds only. (Be sure to "turn off" for tests and sign off days) -0 6 15-27 8 5-7,1-3 -0 18 15-27 8 5-7,1-3 -''') + spec('') } } } @@ -57,7 +44,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_37_maintenance') } scriptPath('JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile') } diff --git a/JenkinsJobs/Builds/build.jenkinsfile b/JenkinsJobs/Builds/build.jenkinsfile index 849230936d9..216bf16732d 100644 --- a/JenkinsJobs/Builds/build.jenkinsfile +++ b/JenkinsJobs/Builds/build.jenkinsfile @@ -19,7 +19,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_37_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 ccec9a66721..fb12892773f 100644 --- a/JenkinsJobs/JobDSL.json +++ b/JenkinsJobs/JobDSL.json @@ -3,6 +3,6 @@ "4.37" ], "Branches": { - "4.37": "master" + "4.37": "R4_37_maintenance" } } diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt index 8e8e3cffd31..2d40108871c 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_37_maintenance" RELEASE_VER="4.37" STREAM="4.37.0" STREAMMajor="4" diff --git a/cje-production/streams/repositories_R4_37_maintenance.txt b/cje-production/streams/repositories_R4_37_maintenance.txt new file mode 100644 index 00000000000..b23e27d157d --- /dev/null +++ b/cje-production/streams/repositories_R4_37_maintenance.txt @@ -0,0 +1,13 @@ +equinox.binaries: R4_37_maintenance +equinox: R4_37_maintenance +equinox.p2: R4_37_maintenance +eclipse.jdt.core.binaries: R4_37_maintenance +eclipse.jdt.core: R4_37_maintenance +eclipse.jdt.debug: R4_37_maintenance +eclipse.jdt: R4_37_maintenance +eclipse.jdt.ui: R4_37_maintenance +eclipse.pde: R4_37_maintenance +eclipse.platform: R4_37_maintenance +eclipse.platform.releng: R4_37_maintenance +eclipse.platform.swt: R4_37_maintenance +eclipse.platform.ui: R4_37_maintenance diff --git a/cje-production/streams/repositories_java25.txt b/cje-production/streams/repositories_java25.txt index 18600a59005..6719d6b57c6 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_37_maintenance +equinox: R4_37_maintenance +equinox.p2: R4_37_maintenance +eclipse.jdt: R4_37_maintenance +eclipse.jdt.core.binaries: R4_37_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_37_maintenance +eclipse.platform.debug: R4_37_maintenance +eclipse.platform.resources: R4_37_maintenance +eclipse.platform: R4_37_maintenance +eclipse.platform.common: R4_37_maintenance +eclipse.platform.releng: R4_37_maintenance +eclipse.platform.runtime: R4_37_maintenance +eclipse.platform.swt: R4_37_maintenance +eclipse.platform.team: R4_37_maintenance +eclipse.platform.text: R4_37_maintenance +eclipse.platform.ua: R4_37_maintenance +eclipse.platform.ui: R4_37_maintenance +eclipse.platform.ui.tools: R4_37_maintenance 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