Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2018-05-30 09:58:11 +0000
committerSravan Kumar Lakkimsetti2018-05-30 09:58:11 +0000
commitb2748937f933ed36c5f2f0677c1c63233d2f3665 (patch)
tree6b04eaf386702958963385d01e492c3b4615aadf /production
parent4933d3953cf6af887c40461568ea14b0d6c0c260 (diff)
downloadeclipse.platform.releng.aggregator-b2748937f933ed36c5f2f0677c1c63233d2f3665.tar.gz
eclipse.platform.releng.aggregator-b2748937f933ed36c5f2f0677c1c63233d2f3665.tar.xz
eclipse.platform.releng.aggregator-b2748937f933ed36c5f2f0677c1c63233d2f3665.zip
Bug 535193 - Update product version number to 4.9 across build scripts
Change-Id: Ib61e4010e1d4a5778dcead37f183c915bd2f8232 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'production')
-rwxr-xr-xproduction/build-functions.shsource20
-rw-r--r--production/build_eclipse_org.shsource4
-rwxr-xr-xproduction/createReports.sh47
-rw-r--r--production/downloadsites/eclipse/downloads/dlconfig4.php4
-rwxr-xr-xproduction/miscToolsAndNotes/checkComposites/checkComposites.sh4
-rwxr-xr-xproduction/miscToolsAndNotes/updaterepo/updateGenericComposites.sh8
-rw-r--r--production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml4
-rwxr-xr-xproduction/sdk/bootstrap/mb4I_hudson.sh6
-rwxr-xr-xproduction/sdk/cleaners/cleanupNightlyRepo.sh19
-rw-r--r--production/testScripts/configuration/streamSpecific.properties2
10 files changed, 46 insertions, 72 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 0e29d6f09..52d14d49e 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1179,20 +1179,20 @@ fn-summarize-apitooling ()
EBuilderDir=$BUILD_DIR/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
pushd "$BUILD_DIR"
# Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports.
-# FREEZE_PARAMS=" "
+ FREEZE_PARAMS=" "
# When no "freeze" in effect for a release comment these out. Uncomment after M6, changing to appropriate versions.
- FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.8M6-201803080630/eclipse-SDK-4.8M6-win32.zip \
- -DfreezeName=Eclipse-SDK-4.8M6 \
- -DfreezeFilename=eclipse-SDK-4.8M6-win32.zip "
+ #FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.8M6-201803080630/eclipse-SDK-4.8M6-win32.zip \
+ # -DfreezeName=Eclipse-SDK-4.8M6 \
+ # -DfreezeFilename=eclipse-SDK-4.8M6-win32.zip "
# this API_PREV_REF_LABEL variable should be changed any time the version used
# by previousBaseURL changes. Its purpose is just to localize changes to this one
# place, and not have to make further, hard-coded changes to php files.
# Similar for freeze label.
# NOTE: the *reference* for API changes should be the "previous release", even if it is a "service release".
- API_PREV_REF_LABEL=4.7.3a
+ API_PREV_REF_LABEL=4.8RC2
fn-write-property API_PREV_REF_LABEL
- API_FREEZE_REF_LABEL=4.8M6
-# API_FREEZE_REF_LABEL=" "
+ #API_FREEZE_REF_LABEL=4.8M6
+ API_FREEZE_REF_LABEL=" "
fn-write-property API_FREEZE_REF_LABEL
java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
-data ${BUILD_DIR}/workspace-apitoolingsLogs \
@@ -1203,9 +1203,9 @@ fn-summarize-apitooling ()
-DbuildId="$BUILD_ID" \
-DbuildLabel="$BUILD_ID" \
-DbuildWorkingArea="${BUILD_HOME}/4${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" \
- -DpreviousBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-win32.zip \
- -DpreviousBaselineName=Eclipse-SDK-4.7.3a \
- -DpreviousBaselineFilename=eclipse-SDK-4.7.3a-win32.zip \
+ -DpreviousBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.8RC2-201805240900/eclipse-SDK-4.8RC2-win32.zip \
+ -DpreviousBaselineName=Eclipse-SDK-4.8RC2 \
+ -DpreviousBaselineFilename=eclipse-SDK-4.8RC2-win32.zip \
-Djava.io.tmpdir=$TMP_DIR \
${FREEZE_PARAMS} \
apiToolsReports
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index db980028b..ac631073e 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -18,8 +18,8 @@ source localBuildProperties.shsource 2>/dev/null
export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
export BRANCH=${BRANCH:-master}
-export STREAM=${STREAM:-4.8.0}
-export BUILD_TYPE=${BUILD_TYPE:-N}
+export STREAM=${STREAM:-4.9.0}
+export BUILD_TYPE=${BUILD_TYPE:-I}
# If not set be caller, make sure its an empty string
# as the variable is sometimes used to "complete" a name,
diff --git a/production/createReports.sh b/production/createReports.sh
index f67ab9e38..a3e718826 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -61,55 +61,24 @@ function latestSimpleRepo
echo ${latestDLrepoSegment}
}
-if [[ ${build_type} == "N" ]]
+if [[ ${build_type} == "I" ]]
then
- update_dir_segment="4.8-N-builds"
- # Note: I am not sure all N-build comparisons are meaninful.
- # we may want a way to "skip" those comparisons.
- latest_M_build=$(latestSimpleRepo "${repo_root}/4.7-M-builds" "M20*")
- RC=$?
- if [[ $RC != 0 ]]
- then
- exit $RC
- fi
- echo -e "\tlatest_M_build: $latest_M_build"
- buildIdToCompare="4.7-M-builds/${latest_M_build}"
-elif [[ ${build_type} == "M" ]]
-then
- update_dir_segment="4.7-M-builds"
- buildIdToCompare="4.7/R-4.7.3a-201803300640"
- echo -e "\tlatest_R_build: R-4.7.3a-201803300640"
-elif [[ ${build_type} == "I" ]]
-then
- update_dir_segment="4.8-I-builds"
- buildIdToCompare="4.7/R-4.7.3a-201803300640"
- echo -e "\tlatest_R_build: R-4.7.3a-201803300640"
+ update_dir_segment="4.9-I-builds"
+ buildIdToCompare="4.8milestones/S-4.8RC2-201805240900"
+ echo -e "\tlatest_R_build: S-4.8RC2-201805240900"
elif [[ ${build_type} == "Y" ]]
then
- update_dir_segment="4.8-Y-builds"
- # Note: we use same value for Y-builds as for I-builds, since conceptually
- # they are the same, except that Y-builds use some code from BETA_JAVA9 branch.
- latest_M_build=$(latestSimpleRepo "${repo_root}/4.7-M-builds" "M20*")
- RC=$?
- if [[ $RC != 0 ]]
- then
- exit $RC
- fi
- echo -e "\tlatest_M_build: $latest_M_build"
- buildIdToCompare="4.7-M-builds/${latest_M_build}"
-elif [[ ${build_type} == "U" ]]
-then
- update_dir_segment="4.7-U-builds"
+ update_dir_segment="4.9-Y-builds"
# Note: we use same value for Y-builds as for I-builds, since conceptually
# they are the same, except that Y-builds use some code from BETA_JAVA9 branch.
- latest_M_build=$(latestSimpleRepo "${repo_root}/4.7-M-builds" "M20*")
+ latest_I_build=$(latestSimpleRepo "${repo_root}/4.8-I-builds" "I20*")
RC=$?
if [[ $RC != 0 ]]
then
exit $RC
fi
- echo -e "\tlatest_M_build: $latest_M_build"
- buildIdToCompare="4.7-M-builds/${latest_M_build}"
+ echo -e "\tlatest_I_build: $latest_I_build"
+ buildIdToCompare="4.8-I-builds/${latest_I_build}"
else
echo -e "\nERROR: Unhandled build type: ${build_type} so update_dir_segment undefined: $update_dir_segment"
echo -e "\n\tand repo reports not produced."
diff --git a/production/downloadsites/eclipse/downloads/dlconfig4.php b/production/downloadsites/eclipse/downloads/dlconfig4.php
index 85a8c8f89..5a2262fb1 100644
--- a/production/downloadsites/eclipse/downloads/dlconfig4.php
+++ b/production/downloadsites/eclipse/downloads/dlconfig4.php
@@ -3,15 +3,11 @@ $dropPrefix = array();
$dropPrefix[]="R";
$dropPrefix[]="S";
$dropPrefix[]="I";
-$dropPrefix[]="M";
-$dropPrefix[]="N";
$dropPrefix[]="P";
$dropType = array();
$dropType[]="Latest Release";
$dropType[]="4.8 Stable Builds";
$dropType[]="4.8 Integration Builds";
-$dropType[]="4.7 Maintenance Builds";
-$dropType[]="4.8 Nightly Builds";
$dropType[]="Patch Builds";
// the "prefix" array and dropType array must be of same size, defined in right order
for ($i = 0; $i < count($dropType); $i++) {
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index c0f4c4a9d..67326f318 100755
--- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh
+++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
@@ -29,6 +29,10 @@ repoList="\
/eclipse/updates/4.7/ \
/eclipse/updates/4.8-I-builds/ \
/eclipse/updates/4.8milestones/ \
+/eclipse/updates/4.8/ \
+/eclipse/updates/4.9-I-builds/ \
+/eclipse/updates/4.9-Y-builds/ \
+/eclipse/updates/4.9milestones/ \
"
diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
index 733a1e88a..b9a9e2bf7 100755
--- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
+++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
@@ -59,15 +59,15 @@ BUILDFILESTR="-f ${BUILDFILE}"
currentStream=$1
if [[ -z "${currentStream}" ]]
then
- printf "\n\t%s\t%s\n" "WARNING:" "Current stream version not specified on command line, assuming 4.8"
- currentStream="4.8"
+ printf "\n\t%s\t%s\n" "WARNING:" "Current stream version not specified on command line, assuming 4.9"
+ currentStream="4.9"
fi
maintenanceStream=$2
if [[ -z "${maintenanceStream}" ]]
then
- printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.7"
- maintenanceStream="4.7"
+ printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.8"
+ maintenanceStream="4.8"
fi
diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
index 2a45ae979..805e28853 100644
--- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
+++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
@@ -24,10 +24,10 @@
<fail
unless="currentStream"
- message="currentStream (such as '4.8') must be defined for this script" />
+ message="currentStream (such as '4.9') must be defined for this script" />
<fail
unless="maintenanceStream"
- message="maintenanceStream (such as '4.7') must be defined for this script" />
+ message="maintenanceStream (such as '4.8') must be defined for this script" />
<!-- Note: we do not put stream number in 'name', since once a 'name' is defined
in Eclipse's UI, it does not change. -->
diff --git a/production/sdk/bootstrap/mb4I_hudson.sh b/production/sdk/bootstrap/mb4I_hudson.sh
index fe42da75b..ffcc94ed0 100755
--- a/production/sdk/bootstrap/mb4I_hudson.sh
+++ b/production/sdk/bootstrap/mb4I_hudson.sh
@@ -78,9 +78,9 @@ echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) "
echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
-export BRANCH=R4_7_maintenance
+export BRANCH=master
export BUILD_TYPE=I
-export STREAM=4.7.0
+export STREAM=4.9.0
eclipseStreamMajor=${STREAM:0:1}
@@ -101,7 +101,7 @@ export ALL_PROXY=${ALL_PROXY:-proxy.eclipse.org:9898}
# default (later) is set to 'true'.
# set to false here for less output.
# setting to false until bug 495750 is fixed, else too much output.
-# export MVN_DEBUG=false
+export MVN_DEBUG=false
export PRODUCTION_SCRIPTS_DIR=production
diff --git a/production/sdk/cleaners/cleanupNightlyRepo.sh b/production/sdk/cleaners/cleanupNightlyRepo.sh
index 2de44f6fb..6469cbfc9 100755
--- a/production/sdk/cleaners/cleanupNightlyRepo.sh
+++ b/production/sdk/cleaners/cleanupNightlyRepo.sh
@@ -207,13 +207,12 @@ function cleanRepo ()
remoteBase="/home/data/httpd/download.eclipse.org"
-eclipseNRepo="${remoteBase}/eclipse/updates/4.8-N-builds"
eclipseIRepo="${remoteBase}/eclipse/updates/4.8-I-builds"
-eclipseMRepo="${remoteBase}/eclipse/updates/4.7-M-builds"
eclipseSRepo="${remoteBase}/eclipse/updates/4.8milestones"
-eclipseYRepo="${remoteBase}/eclipse/updates/4.8-Y-builds"
-eclipsePRepo="${remoteBase}/eclipse/updates/4.8-P-builds"
-eclipseURepo="${remoteBase}/eclipse/updates/4.7-U-builds"
+eclipseYRepo="${remoteBase}/eclipse/updates/4.9-Y-builds"
+eclipsePRepo="${remoteBase}/eclipse/updates/4.9-P-builds"
+eclipseI49Repo="${remoteBase}/eclipse/updates/4.8-I-builds"
+eclipseS49Repo="${remoteBase}/eclipse/updates/4.8milestones"
#doDryrun=dryrun
doDryrun=
@@ -221,8 +220,14 @@ doDryrun=
declare -a reposToRemove=()
cleanRepo $eclipseIRepo I 4 $doDryrun
declare -a reposToRemove=()
-cleanRepo $eclipseMRepo M 4 $doDryrun
-declare -a reposToRemove=()
cleanRepo $eclipseSRepo S 2 $doDryrun
+declare -a reposToRemove=()
+cleanRepo $eclipseI49Repo I 4 $doDryrun
+declare -a reposToRemove=()
+cleanRepo $eclipseS49Repo S 2 $doDryrun
+declare -a reposToRemove=()
+cleanRepo $eclipseYRepo I 2 $doDryrun
+declare -a reposToRemove=()
+cleanRepo $eclipsePRepo S 2 $doDryrun
unset reposToRemove
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 8397179a6..31d79bfa1 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -5,7 +5,7 @@
# purely title or identifier for display, to help confirm right file
# is being retrieved and used.
-streamSpecificPropertiesTitle="Properties for 4.8.0 builds and tests"
+streamSpecificPropertiesTitle="Properties for 4.9.0 builds and tests"
# These "previousRelease" variables are primarily used to have a
# stable version of Eclipse, that is used, for example, for it's p2

Back to the top