diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy index fb5bc744ac3..72db293c0cc 100644 --- a/JenkinsJobs/Builds/I_build.groovy +++ b/JenkinsJobs/Builds/I_build.groovy @@ -24,8 +24,8 @@ for (STREAM in STREAMS){ # Milestone/RC Schedule # Post M1, no nightlies, I-builds only. (Be sure to "turn off" for tests and sign off days) -0 6 18-29 5 5-7,1-3 -0 18 18-29 5 5-7,1-3 +#0 6 18-29 5 5-7,1-3 +#0 18 18-29 5 5-7,1-3 diff --git a/JenkinsJobs/JobDSL.json b/JenkinsJobs/JobDSL.json index 49bf45daa20..9c5124641c3 100644 --- a/JenkinsJobs/JobDSL.json +++ b/JenkinsJobs/JobDSL.json @@ -3,6 +3,6 @@ "4.32" ], "Branches": { - "4.32": "master" + "4.32": "R4_32_maintenance" } } diff --git a/JenkinsJobs/YBuilds/P_build.groovy b/JenkinsJobs/YBuilds/P_build.groovy index cc8530fe8e1..8ba48cb2371 100644 --- a/JenkinsJobs/YBuilds/P_build.groovy +++ b/JenkinsJobs/YBuilds/P_build.groovy @@ -145,7 +145,7 @@ spec: sshagent(['github-bot-ssh']) { dir ('eclipse.platform.releng.aggregator') { sh \'\'\' - git clone -b master git@github.com:eclipse-platform/eclipse.platform.releng.aggregator.git + git clone -b R4_32_maintenance git@github.com:eclipse-platform/eclipse.platform.releng.aggregator.git \'\'\' } } diff --git a/JenkinsJobs/YBuilds/Y_build.groovy b/JenkinsJobs/YBuilds/Y_build.groovy index 9dadfedc10b..274b1e6954c 100644 --- a/JenkinsJobs/YBuilds/Y_build.groovy +++ b/JenkinsJobs/YBuilds/Y_build.groovy @@ -165,7 +165,7 @@ spec: sshagent(['github-bot-ssh']) { dir ('eclipse.platform.releng.aggregator') { sh \'\'\' - git clone -b master git@github.com:eclipse-platform/eclipse.platform.releng.aggregator.git + git clone -b R4_32_maintenance git@github.com:eclipse-platform/eclipse.platform.releng.aggregator.git \'\'\' } } diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt index cf1b77f7f36..11292140a50 100644 --- a/cje-production/P-build/buildproperties.txt +++ b/cje-production/P-build/buildproperties.txt @@ -16,7 +16,7 @@ # with # are considered comments and no spaces allowed in keys # CJE build variables -BRANCH="master" +BRANCH="R4_32_maintenance" PATCH_OR_BRANCH_LABEL="java22patch" PATCH_BUILD="java22patch" BUILD_TYPE_NAME="Beta Java 22" diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt index 79b6c6af9f8..7346968e12e 100644 --- a/cje-production/Y-build/buildproperties.txt +++ b/cje-production/Y-build/buildproperties.txt @@ -16,7 +16,7 @@ # with # are considered comments and no spaces allowed in keys # CJE build variables -BRANCH="master" +BRANCH="R4_32_maintenance" PATCH_OR_BRANCH_LABEL="java23" BUILD_TYPE_NAME="Beta Java 23" BUILD_TYPE="Y" diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt index 4a2ddde182d..5740baae9b7 100644 --- a/cje-production/buildproperties.txt +++ b/cje-production/buildproperties.txt @@ -16,7 +16,7 @@ # with # are considered comments and no spaces allowed in keys # CJE build variables -BRANCH="master" +BRANCH="R4_32_maintenance" PATCH_OR_BRANCH_LABEL="master" BUILD_TYPE_NAME="Integration" BUILD_TYPE="I" diff --git a/cje-production/streams/repositories_R4_32_maintenance.txt b/cje-production/streams/repositories_R4_32_maintenance.txt new file mode 100644 index 00000000000..712887296b8 --- /dev/null +++ b/cje-production/streams/repositories_R4_32_maintenance.txt @@ -0,0 +1,13 @@ +rt.equinox.binaries: R4_32_maintenance +equinox: R4_32_maintenance +rt.equinox.p2: R4_32_maintenance +eclipse.jdt.core.binaries: R4_32_maintenance +eclipse.jdt.core: R4_32_maintenance +eclipse.jdt.debug: R4_32_maintenance +eclipse.jdt: R4_32_maintenance +eclipse.jdt.ui: R4_32_maintenance +eclipse.pde: R4_32_maintenance +eclipse.platform: R4_32_maintenance +eclipse.platform.releng: R4_32_maintenance +eclipse.platform.swt: R4_32_maintenance +eclipse.platform.ui: R4_32_maintenance diff --git a/cje-production/streams/repositories_java23.txt b/cje-production/streams/repositories_java23.txt index 637e63d8d0a..55140776192 100644 --- a/cje-production/streams/repositories_java23.txt +++ b/cje-production/streams/repositories_java23.txt @@ -1,21 +1,21 @@ -rt.equinox.binaries: master -equinox: master -rt.equinox.p2: master -eclipse.jdt: master -eclipse.jdt.core.binaries: master +rt.equinox.binaries: R4_32_maintenance +equinox: R4_32_maintenance +rt.equinox.p2: R4_32_maintenance +eclipse.jdt: R4_32_maintenance +eclipse.jdt.core.binaries: R4_32_maintenance eclipse.jdt.core: BETA_JAVA23 eclipse.jdt.debug: BETA_JAVA23 eclipse.jdt.ui: BETA_JAVA23 -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_32_maintenance +eclipse.platform.debug: R4_32_maintenance +eclipse.platform.resources: R4_32_maintenance +eclipse.platform: R4_32_maintenance +eclipse.platform.common: R4_32_maintenance +eclipse.platform.releng: R4_32_maintenance +eclipse.platform.runtime: R4_32_maintenance +eclipse.platform.swt: R4_32_maintenance +eclipse.platform.team: R4_32_maintenance +eclipse.platform.text: R4_32_maintenance +eclipse.platform.ua: R4_32_maintenance +eclipse.platform.ui: R4_32_maintenance +eclipse.platform.ui.tools: R4_32_maintenance diff --git a/cje-production/streams/repositories_master.txt b/cje-production/streams/repositories_master.txt deleted file mode 100644 index 1adba432fe8..00000000000 --- a/cje-production/streams/repositories_master.txt +++ /dev/null @@ -1,13 +0,0 @@ -rt.equinox.binaries: master -equinox: master -rt.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