Bug 575779 - Move 4.21-I-builds to R4_21_maintenance branch
Change-Id: I2b8fa3e181409971e202e0c3192b448b4dae340c
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng.aggregator/+/184936
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
diff --git a/JenkinsJobs/Builds/I-build.groovy b/JenkinsJobs/Builds/I-build.groovy
index eead46b..efcf9ac 100644
--- a/JenkinsJobs/Builds/I-build.groovy
+++ b/JenkinsJobs/Builds/I-build.groovy
@@ -119,7 +119,7 @@
sshagent(['git.eclipse.org-bot-ssh']) {
dir ('eclipse.platform.releng.aggregator') {
sh '''
- git clone -b master ssh://genie.releng@git.eclipse.org:29418/platform/eclipse.platform.releng.aggregator.git
+ git clone -b R4_21_maintenance ssh://genie.releng@git.eclipse.org:29418/platform/eclipse.platform.releng.aggregator.git
'''
}
}
@@ -161,7 +161,7 @@
}
stage('Swt build input') {
steps {
- build 'SWT-Increment_if_needed'
+ build 'SWT-Increment_if_needed_without_chromium_maintenance'
}
}
stage('Create Base builder'){
diff --git a/JenkinsJobs/Builds/Y-build.groovy b/JenkinsJobs/Builds/Y-build.groovy
index f5d687e..ffc876e 100644
--- a/JenkinsJobs/Builds/Y-build.groovy
+++ b/JenkinsJobs/Builds/Y-build.groovy
@@ -119,7 +119,7 @@
sshagent(['git.eclipse.org-bot-ssh']) {
dir ('eclipse.platform.releng.aggregator') {
sh '''
- git clone -b master ssh://genie.releng@git.eclipse.org:29418/platform/eclipse.platform.releng.aggregator.git
+ git clone -b R4_21_maintenance ssh://genie.releng@git.eclipse.org:29418/platform/eclipse.platform.releng.aggregator.git
'''
}
}
@@ -162,7 +162,7 @@
}
stage('Swt build input') {
steps {
- build 'SWT-Increment_if_needed'
+ build 'SWT-Increment_if_needed_without_chromium_maintenance'
}
}
stage('Create Base builder'){
diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt
index 4d86787..daaec44 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_21_maintenance"
PATCH_OR_BRANCH_LABEL="java17patch"
PATCH_BUILD="java17patch"
BUILD_TYPE_NAME="Beta Java 17"
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
index a77c648..6de4386 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_21_maintenance"
PATCH_OR_BRANCH_LABEL="java17"
BUILD_TYPE_NAME="Beta Java 17"
BUILD_TYPE="Y"
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index f151eb3..1461795 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -16,8 +16,8 @@
# with # are considered comments and no spaces allowed in keys
# CJE build variables
-BRANCH="master"
-PATCH_OR_BRANCH_LABEL="master"
+BRANCH="R4_21_maintenance"
+PATCH_OR_BRANCH_LABEL="R4_21_maintenance"
BUILD_TYPE_NAME="Integration"
BUILD_TYPE="I"
TESTED_BUILD_TYPE="I"
diff --git a/cje-production/streams/repositories_R4_21_maintenance.txt b/cje-production/streams/repositories_R4_21_maintenance.txt
new file mode 100644
index 0000000..f8e4377
--- /dev/null
+++ b/cje-production/streams/repositories_R4_21_maintenance.txt
@@ -0,0 +1,24 @@
+rt.equinox.binaries: R4_21_maintenance
+rt.equinox.bundles: R4_21_maintenance
+rt.equinox.framework: R4_21_maintenance
+rt.equinox.p2: R4_21_maintenance
+eclipse.jdt.core.binaries: R4_21_maintenance
+eclipse.jdt.core: R4_21_maintenance
+eclipse.jdt.debug: R4_21_maintenance
+eclipse.jdt: R4_21_maintenance
+eclipse.jdt.ui: R4_21_maintenance
+eclipse.pde.build: R4_21_maintenance
+eclipse.pde.ui: R4_21_maintenance
+eclipse.platform.debug: R4_21_maintenance
+eclipse.platform.resources: R4_21_maintenance
+eclipse.platform: R4_21_maintenance
+eclipse.platform.common: R4_21_maintenance
+eclipse.platform.releng: R4_21_maintenance
+eclipse.platform.runtime: R4_21_maintenance
+eclipse.platform.swt: R4_21_maintenance
+eclipse.platform.swt.binaries: R4_21_maintenance
+eclipse.platform.team: R4_21_maintenance
+eclipse.platform.text: R4_21_maintenance
+eclipse.platform.ua: R4_21_maintenance
+eclipse.platform.ui: R4_21_maintenance
+eclipse.platform.ui.tools: R4_21_maintenance
diff --git a/cje-production/streams/repositories_java17.txt b/cje-production/streams/repositories_java17.txt
index a4fdada..f822510 100644
--- a/cje-production/streams/repositories_java17.txt
+++ b/cje-production/streams/repositories_java17.txt
@@ -1,24 +1,24 @@
-rt.equinox.binaries: master
-rt.equinox.bundles: master
-rt.equinox.framework: master
-rt.equinox.p2: master
-eclipse.jdt: master
-eclipse.jdt.core.binaries: master
+rt.equinox.binaries: R4_21_maintenance
+rt.equinox.bundles: R4_21_maintenance
+rt.equinox.framework: R4_21_maintenance
+rt.equinox.p2: R4_21_maintenance
+eclipse.jdt: R4_21_maintenance
+eclipse.jdt.core.binaries: R4_21_maintenance
eclipse.jdt.core: BETA_JAVA17
eclipse.jdt.debug: BETA_JAVA17
eclipse.jdt.ui: BETA_JAVA17
eclipse.pde.build: BETA_JAVA17
eclipse.pde.ui: BETA_JAVA17
-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.swt.binaries: master
-eclipse.platform.team: master
-eclipse.platform.text: master
-eclipse.platform.ua: master
-eclipse.platform.ui: master
-eclipse.platform.ui.tools: master
+eclipse.platform.debug: R4_21_maintenance
+eclipse.platform.resources: R4_21_maintenance
+eclipse.platform: R4_21_maintenance
+eclipse.platform.common: R4_21_maintenance
+eclipse.platform.releng: R4_21_maintenance
+eclipse.platform.runtime: R4_21_maintenance
+eclipse.platform.swt: R4_21_maintenance
+eclipse.platform.swt.binaries: R4_21_maintenance
+eclipse.platform.team: R4_21_maintenance
+eclipse.platform.text: R4_21_maintenance
+eclipse.platform.ua: R4_21_maintenance
+eclipse.platform.ui: R4_21_maintenance
+eclipse.platform.ui.tools: R4_21_maintenance
diff --git a/cje-production/streams/repositories_master.txt b/cje-production/streams/repositories_master.txt
deleted file mode 100644
index 41975b3..0000000
--- a/cje-production/streams/repositories_master.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-rt.equinox.binaries: master
-rt.equinox.bundles: master
-rt.equinox.framework: 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.build: master
-eclipse.pde.ui: 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.swt.binaries: 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/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_master.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_R4_21_maintenance.php
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_master.php
rename to eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_R4_21_maintenance.php
