Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2018-09-05 01:56:54 -0400
committerSravan Kumar Lakkimsetti2018-09-05 03:49:48 -0400
commit7cc7c550b89b0091ff943b7d8d3c1a8370617854 (patch)
tree4824f280f6700d0f8d7ba52af6e011f883a24969
parentc26572aa0241799297878fb933eb72e31b85721d (diff)
downloadeclipse.platform.releng.aggregator-7cc7c550b89b0091ff943b7d8d3c1a8370617854.tar.gz
eclipse.platform.releng.aggregator-7cc7c550b89b0091ff943b7d8d3c1a8370617854.tar.xz
eclipse.platform.releng.aggregator-7cc7c550b89b0091ff943b7d8d3c1a8370617854.zip
Bug 538535 - Update product version number to 4.10 across build scripts
Change-Id: I89b76fdc1d644368ff8308c356971938dc65e96a Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--eclipse-platform-parent/pom.xml6
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf10
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf10
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf10
-rwxr-xr-xproduction/build-functions.shsource8
-rw-r--r--production/build_eclipse_org.shsource2
-rwxr-xr-xproduction/miscToolsAndNotes/checkComposites/checkComposites.sh3
-rwxr-xr-xproduction/miscToolsAndNotes/updaterepo/updateGenericComposites.sh6
-rw-r--r--production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml4
-rw-r--r--production/sdk/bootstrap/mb410I_hudson.sh132
-rw-r--r--production/testScripts/configuration/streamSpecific.properties2
-rwxr-xr-xproduction/testScripts/test_runTests2.xml.sh2
13 files changed, 166 insertions, 31 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 4e1c3aa1..c8635458 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -48,7 +48,7 @@
such as Version: Mars (4.5), for main features.
See bug 328139.
-->
- <releaseName>2018-09</releaseName>
+ <releaseName>2018-12</releaseName>
<!--
The releaseNumbers below, for SDK and Platform, might be
thought of as the "marketing number" or "branding number",
@@ -63,8 +63,8 @@
but we'd still want the "marketing number" to be increased to reflect
"a new yearly release".
-->
- <releaseNumberSDK>4.9</releaseNumberSDK>
- <releaseNumberPlatform>4.9</releaseNumberPlatform>
+ <releaseNumberSDK>4.10</releaseNumberSDK>
+ <releaseNumberPlatform>4.10</releaseNumberPlatform>
<!-- Using snapshot, or locally built (forked) snapshot version for bug 484000.
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt
index 2773c1a3..2c7f126d 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt
@@ -1,4 +1,4 @@
-# List of approved API changes after 4.9 M6
+# List of approved API changes after 4.10 M3
# The unapproved entry exclude list can be copied from <build>/buildlogs/mb080_publish-eclipse_output.txt
# Search for: Potential exclude list:
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
index 4f513a30..66885087 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
@@ -1,8 +1,8 @@
instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.9,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.9,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-09,name:2018-09);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-09,name:2018-09);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.10,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.10,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.configuration.macosx
@@ -49,7 +49,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true
properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = Initial 4.9 Release of the Platform SDK.
+properties.1.value = Initial 4.10 Release of the Platform SDK.
properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse.org
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index e3c1ed2c..8cd04092 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
@@ -1,8 +1,8 @@
instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.9,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.9,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-09,name:2018-09);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-09,name:2018-09);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.10,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.10,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.platform.configuration.macosx
@@ -51,7 +51,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true
properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = Initial 4.9 Release of the Eclipse Platform.
+properties.1.value = Initial 4.10 Release of the Eclipse Platform.
properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse.org
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
index 387c32d7..9e85d20e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
@@ -1,8 +1,8 @@
instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.9,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.9,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-09,name:2018-09);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-09,name:2018-09);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.10,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.10,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.sdk.configuration.macosx
@@ -49,7 +49,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true
properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = Initial 4.9 Release of the Eclipse SDK.
+properties.1.value = Initial 4.10 Release of the Eclipse SDK.
properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse.org
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index fed40be1..2efa7db5 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1147,9 +1147,9 @@ fn-summarize-apitooling ()
# Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports.
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.10M3-201803080630/eclipse-SDK-4.10M3-win32.zip \
+ # -DfreezeName=Eclipse-SDK-4.10M3 \
+ # -DfreezeFilename=eclipse-SDK-4.10M3-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.
@@ -1157,7 +1157,7 @@ fn-summarize-apitooling ()
# NOTE: the *reference* for API changes should be the "previous release", even if it is a "service release".
API_PREV_REF_LABEL=4.8
fn-write-property API_PREV_REF_LABEL
- #API_FREEZE_REF_LABEL=4.8M6
+ #API_FREEZE_REF_LABEL=4.10M3
API_FREEZE_REF_LABEL=" "
fn-write-property API_FREEZE_REF_LABEL
java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index 71c345e0..b09037b1 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -21,7 +21,7 @@ source localBuildProperties.shsource 2>/dev/null
export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
export BRANCH=${BRANCH:-master}
-export STREAM=${STREAM:-4.9.0}
+export STREAM=${STREAM:-4.10.0}
export BUILD_TYPE=${BUILD_TYPE:-I}
# If not set be caller, make sure its an empty string
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index 89562511..93f3db62 100755
--- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh
+++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
@@ -30,9 +30,12 @@ repoAccess=${repoFileAccess}
# TODO: reduce this list soon
repoList="\
/eclipse/updates/4.8/ \
+/eclipse/updates/4.9/ \
/eclipse/updates/4.9-I-builds/ \
/eclipse/updates/4.9-Y-builds/ \
/eclipse/updates/4.9milestones/ \
+/eclipse/updates/4.10-I-builds/ \
+/eclipse/updates/4.10milestones/ \
"
diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
index 55d17d67..43b9772d 100755
--- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
+++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
@@ -62,15 +62,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.9"
- currentStream="4.9"
+ printf "\n\t%s\t%s\n" "WARNING:" "Current stream version not specified on command line, assuming 4.10"
+ currentStream="4.10"
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.8"
- maintenanceStream="4.8"
+ maintenanceStream="4.9"
fi
diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
index 8b3e2cdf..6f2e76d0 100644
--- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
+++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
@@ -27,10 +27,10 @@
<fail
unless="currentStream"
- message="currentStream (such as '4.9') must be defined for this script" />
+ message="currentStream (such as '4.10') must be defined for this script" />
<fail
unless="maintenanceStream"
- message="maintenanceStream (such as '4.8') must be defined for this script" />
+ message="maintenanceStream (such as '4.9') 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/mb410I_hudson.sh b/production/sdk/bootstrap/mb410I_hudson.sh
new file mode 100644
index 00000000..086449cd
--- /dev/null
+++ b/production/sdk/bootstrap/mb410I_hudson.sh
@@ -0,0 +1,132 @@
+#!/usr/bin/env bash
+
+# This job is just like its cronjob counter part, except it
+# turns off verbose debugging (else Hudson logs would be 300 MB)
+# and does not pipe output to separate files, but lets it all go
+# to Hudson't "console".
+# Normally resides in $BUILD_HOME
+
+function usage()
+{
+ printf "\n\tSimple script start a build of a certain stream." >&2
+ printf "\n\tUsage: %s [[-h] | [-t]] " $(basename $0) >&2
+ printf "\n\t\t%s\n" "where h==help, t==test build " >&2
+}
+
+# Start with minimal path for consistency across machines
+# plus, cron jobs do not inherit an environment
+# care is needed not have anything in ${HOME}/bin that would effect the build
+# unintentionally, but is required to make use of "source localBuildProperties.shsource" on
+# local machines.
+# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it
+# to false) for a test I-build on a remote machine.
+export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin
+# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves)
+unset JAVA_HOME
+unset JAVA_ROOT
+unset JAVA_JRE
+unset CLASSPATH
+unset JAVA_BINDIR
+unset JRE_HOME
+
+# 0002 is often the default for shell users, but it is not when ran from
+# a cron job, so we set it explicitly, so releng group has write access to anything
+# we create.
+NEWUMASK="0002"
+oldumask=$(umask)
+umask $NEWUMASK
+
+echo "ulimit (file handles): $( ulimit -n ) "
+ulimit -n 4096
+echo "ulimit (file handles): $( ulimit -n ) "
+
+echo "locale charmap: $(locale charmap)"
+echo "LC_ALL: $LC_ALL"
+echo "LANG: $LANG"
+echo "LANGUAGE: $LANGUAGE"
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+export LANGUAGE=en_US.UTF-8
+echo "LC_ALL: $LC_ALL"
+echo "LANG: $LANG"
+echo "LANGUAGE: $LANGUAGE"
+echo "locale charmap: $(locale charmap)"
+
+# all optional
+# normally, when ran from crobjob, none should be specified
+while getopts 'hti' OPTION
+do
+ case $OPTION in
+ h) usage
+ exit
+ ;;
+ t) export testbuildonly=true
+ ;;
+ i) export invisibleBuild=true
+ ;;
+ esac
+done
+
+# this localBuildProperties.shsource file is to ease local builds to override some variables.
+# It should not be used for production builds.
+source localBuildProperties.shsource 2>/dev/null
+
+# BUILD_HOME defines the "top" of the build area (for all types of builds)
+export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
+
+SCRIPT_NAME=$0
+
+echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) "
+
+echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
+
+export BRANCH=master
+export BUILD_TYPE=I
+export STREAM=4.10.0
+
+eclipseStreamMajor=${STREAM:0:1}
+
+# unique short name for stream and build type
+BUILDSTREAMTYPEDIR=${eclipseStreamMajor}$BUILD_TYPE
+
+export BUILD_ROOT=${BUILD_HOME}/${BUILDSTREAMTYPEDIR}
+
+# These values for proxies come from the configuration files of the Releng HIPP instance.
+# They are normally defined in "ANT_OPTS" and similar environment variables, but
+# the JavaDoc program requires them is this special -Jflag form.
+export JAVA_DOC_PROXIES=${JAVA_DOC_PROXIES:-"-J-Dhttps.proxyHost=proxy.eclipse.org -J-Dhttps.proxyPort=9898 -J-Dhttps.nonProxyHosts=\"172.30.206.*\""}
+
+# These definitions are primarily for Curl. (Wget and other programs use different env variables or parameters
+export NO_PROXY=${NO_PROXY:-eclipse.org,build.eclipse.org,download.eclipse.org,archive.eclipse.org,dev.eclipes.org,git.eclipse.org}
+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 PRODUCTION_SCRIPTS_DIR=production
+if [[ -z "${WORKSPACE}" ]]
+then
+ export RUNNING_ON_HUDSON=false
+else
+ export RUNNING_ON_HUDSON=true
+fi
+echo -e "\n\t[INFO]RUNNING_ON_HUDSON: $RUNNING_ON_HUDSON"
+
+# To allow this cron job to work from hudson, or traditional crontab
+if [[ -z "${WORKSPACE}" ]]
+then
+ export UTILITIES_HOME=/shared/eclipse
+ source $BUILD_HOME/bootstrap.shsource
+ makeProductionDirectoryOnBuildMachine
+ # build_eclipse_org.shsource should come from branch
+ # though ideally the rest of "production" directory would be identical between branches.
+${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/master-build.sh "${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/build_eclipse_org.shsource"
+else
+ export UTILITIES_HOME=${WORKSPACE}/utilities/production
+ source $UTILITIES_HOME/sdk/bootstrap/bootstrap.shsource
+ $UTILITIES_HOME/master-build.sh $UTILITIES_HOME/build_eclipse_org.shsource
+fi
+
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 94776ca2..4ef4be45 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.9.0 builds and tests"
+streamSpecificPropertiesTitle="Properties for 4.10.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
diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index 51d6a4e0..f2783b19 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -86,7 +86,7 @@ wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose http://${GIT_HOST}/c/platfor
ANTFILE=getEBuilder.xml
buildId=I20150320-0800
-eclipseStream=4.8.0
+eclipseStream=4.10.0
EBUILDER_HASH=master
#EBUILDER_HASH=4295494c43e464a0c4ee39b7e0c847fbc3263f2a

Back to the top