From a6cc8efd764ee8723de1557da79641e326f1971d Mon Sep 17 00:00:00 2001 From: Rahul Mohanan <121536011+MohananRahul@users.noreply.github.com> Date: Sun, 1 Sep 2024 16:38:51 +0530 Subject: [PATCH] Revert "Move 4.33-I builds to R4_33_maintenance branch (#2278)" (#2279) This reverts commit 9460c60546e1b1da0449d2ce141bb3c7059b7b28. --- JenkinsJobs/Builds/I_build.groovy | 4 +-- JenkinsJobs/JobDSL.json | 2 +- JenkinsJobs/YBuilds/P_build.groovy | 2 +- JenkinsJobs/YBuilds/Y_build.groovy | 2 +- cje-production/P-build/buildproperties.txt | 2 +- cje-production/Y-build/buildproperties.txt | 2 +- cje-production/buildproperties.txt | 2 +- .../repositories_R4_33_maintenance.txt | 13 ------- .../streams/repositories_java23.txt | 36 +++++++++---------- .../streams/repositories_master.txt | 13 +++++++ 10 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 cje-production/streams/repositories_R4_33_maintenance.txt create mode 100644 cje-production/streams/repositories_master.txt diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy index 1d1ab18baf8..114a698d9f0 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 16-28 8 5-7,1-3 -# 0 18 16-28 8 5-7,1-3 +0 6 16-28 8 5-7,1-3 +0 18 16-28 8 5-7,1-3 """) } } diff --git a/JenkinsJobs/JobDSL.json b/JenkinsJobs/JobDSL.json index 0c688cb8038..3fa69ac3d5e 100644 --- a/JenkinsJobs/JobDSL.json +++ b/JenkinsJobs/JobDSL.json @@ -3,6 +3,6 @@ "4.33" ], "Branches": { - "4.33": "R4_33_maintenance" + "4.33": "master" } } diff --git a/JenkinsJobs/YBuilds/P_build.groovy b/JenkinsJobs/YBuilds/P_build.groovy index aa0fd88e924..7f585b63c1f 100644 --- a/JenkinsJobs/YBuilds/P_build.groovy +++ b/JenkinsJobs/YBuilds/P_build.groovy @@ -73,7 +73,7 @@ spec: sshagent(['github-bot-ssh']) { dir ('eclipse.platform.releng.aggregator') { sh \'\'\' - git clone -b R4_33_maintenance git@github.com:eclipse-platform/eclipse.platform.releng.aggregator.git + git clone -b master 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 923a2ed93a3..b9d690aa7c2 100644 --- a/JenkinsJobs/YBuilds/Y_build.groovy +++ b/JenkinsJobs/YBuilds/Y_build.groovy @@ -93,7 +93,7 @@ spec: sshagent(['github-bot-ssh']) { dir ('eclipse.platform.releng.aggregator') { sh \'\'\' - git clone -b R4_33_maintenance git@github.com:eclipse-platform/eclipse.platform.releng.aggregator.git + git clone -b master 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 67f710b6ba9..8d853c60b9a 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="R4_33_maintenance" +BRANCH="master" PATCH_OR_BRANCH_LABEL="java23patch" PATCH_BUILD="java23patch" BUILD_TYPE_NAME="Beta Java 23" diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt index 19e97d24d3e..a27b941101e 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="R4_33_maintenance" +BRANCH="master" 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 e2bf9914450..e7ab4720613 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="R4_33_maintenance" +BRANCH="master" PATCH_OR_BRANCH_LABEL="master" BUILD_TYPE_NAME="Integration" BUILD_TYPE="I" diff --git a/cje-production/streams/repositories_R4_33_maintenance.txt b/cje-production/streams/repositories_R4_33_maintenance.txt deleted file mode 100644 index baaeac56305..00000000000 --- a/cje-production/streams/repositories_R4_33_maintenance.txt +++ /dev/null @@ -1,13 +0,0 @@ -equinox.binaries: R4_33_maintenance -equinox: R4_33_maintenance -equinox.p2: R4_33_maintenance -eclipse.jdt.core.binaries: R4_33_maintenance -eclipse.jdt.core: R4_33_maintenance -eclipse.jdt.debug: R4_33_maintenance -eclipse.jdt: R4_33_maintenance -eclipse.jdt.ui: R4_33_maintenance -eclipse.pde: R4_33_maintenance -eclipse.platform: R4_33_maintenance -eclipse.platform.releng: R4_33_maintenance -eclipse.platform.swt: R4_33_maintenance -eclipse.platform.ui: R4_33_maintenance \ No newline at end of file diff --git a/cje-production/streams/repositories_java23.txt b/cje-production/streams/repositories_java23.txt index 5f1f48e17cf..d2d39e605b7 100644 --- a/cje-production/streams/repositories_java23.txt +++ b/cje-production/streams/repositories_java23.txt @@ -1,21 +1,21 @@ -equinox.binaries: R4_33_maintenance -equinox: R4_33_maintenance -equinox.p2: R4_33_maintenance -eclipse.jdt: R4_33_maintenance -eclipse.jdt.core.binaries: R4_33_maintenance +equinox.binaries: master +equinox: master +equinox.p2: master +eclipse.jdt: master +eclipse.jdt.core.binaries: master eclipse.jdt.core: BETA_JAVA23 eclipse.jdt.debug: BETA_JAVA23 eclipse.jdt.ui: BETA_JAVA23 -eclipse.pde: R4_33_maintenance -eclipse.platform.debug: R4_33_maintenance -eclipse.platform.resources: R4_33_maintenance -eclipse.platform: R4_33_maintenance -eclipse.platform.common: R4_33_maintenance -eclipse.platform.releng: R4_33_maintenance -eclipse.platform.runtime: R4_33_maintenance -eclipse.platform.swt: R4_33_maintenance -eclipse.platform.team: R4_33_maintenance -eclipse.platform.text: R4_33_maintenance -eclipse.platform.ua: R4_33_maintenance -eclipse.platform.ui: R4_33_maintenance -eclipse.platform.ui.tools: R4_33_maintenance +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 diff --git a/cje-production/streams/repositories_master.txt b/cje-production/streams/repositories_master.txt new file mode 100644 index 00000000000..f2cdaaeb39a --- /dev/null +++ b/cje-production/streams/repositories_master.txt @@ -0,0 +1,13 @@ +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