Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2014-03-08 00:25:09 -0500
committerDavid Williams2014-03-08 00:25:09 -0500
commitb8398de38ab55146ee1f19549aa659e5d6a516e2 (patch)
treec54414a7b0c83ec2745c2845d7115c9e75343bc5
parent0ef1708ca16f20c2d7c7188b645cd33178950bf6 (diff)
downloadeclipse.platform.releng.aggregator-b8398de38ab55146ee1f19549aa659e5d6a516e2.tar.gz
eclipse.platform.releng.aggregator-b8398de38ab55146ee1f19549aa659e5d6a516e2.tar.xz
eclipse.platform.releng.aggregator-b8398de38ab55146ee1f19549aa659e5d6a516e2.zip
Bug 429571 - [BETA_JAVA8] Run various tests involving BETA_JAVA8 work
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template4
-rwxr-xr-xproduction/build-functions.shsource7
-rw-r--r--production/build_eclipse_org.shsource22
-rw-r--r--production/master-build.sh13
-rw-r--r--production/parse-logs.sh2
-rw-r--r--production/publish-eclipse.sh2
-rwxr-xr-xproduction/sdk/promotion/startTests.sh2
-rwxr-xr-xproduction/sdk/promotion/syncDropLocation.sh9
-rwxr-xr-xproduction/sdk/startTests.sh2
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh2
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties2
-rw-r--r--production/testScripts/genTestIndexes.xml2
-rw-r--r--production/testScripts/invokeTestsJSON.xml10
-rw-r--r--production/testScripts/runTests2.xml6
-rwxr-xr-xproduction/testScripts/startTests.sh2
15 files changed, 62 insertions, 25 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
index a9bf19aa..3575d342 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
@@ -280,7 +280,7 @@ $STREAM_SERVICE = $streamArr[2];
// and once in filename. We want the directory-like part.
// And to complicate things, in S and R builds, the segment is no longer BUILD_ID,
// but a more complicated concatination.
-if ($BUILD_TYPE === "N" || $BUILD_TYPE === "P" || $BUILD_TYPE === "I" || $BUILD_TYPE === "M" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y") {
+if ($BUILD_TYPE === "N" || $BUILD_TYPE === "I" || $BUILD_TYPE === "M" || $BUILD_TYPE === "P" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y") {
$STREAM_REPO_NAME=$STREAM_MAJOR.".".$STREAM_MINOR."-".$BUILD_TYPE."-"."builds";
} else {
if ($BUILD_TYPE === "S") {
@@ -307,7 +307,7 @@ if ($pos === false) {
}
// There are two types of M builds, some RCs, some not.
-if ($BUILD_TYPE === "N" || $BUILD_TYPE === "P" || $BUILD_TYPE === "I" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y" || ($BUILD_TYPE === "M" && ! $isRC)) {
+if ($BUILD_TYPE === "N" || $BUILD_TYPE === "I" || $BUILD_TYPE === "P" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y" || ($BUILD_TYPE === "M" && ! $isRC)) {
$BUILD_REPO_NAME=$STREAM_REPO_NAME."/".$BUILD_ID;
} else {
$timestamp = str_replace('-', '', $TIMESTAMP);
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 07e7e694..6acdf558 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -276,7 +276,7 @@ fn-git-reset-submodules ()
}
# USAGE: fn-build-id BUILD_TYPE
-# BUILD_TYPE: I, M, N
+# BUILD_TYPE: I, M, N, X, Y, P
# TODO: depends on RAWDATE being exported/global
fn-build-id ()
{
@@ -1185,6 +1185,11 @@ fn-publish-eclipse ()
-DbuildDirectory=$(dirname "$BUILD_DIR") \
-Djava.io.tmpdir=$TMP_DIR \
publish
+ # hide experimental builds, for now
+ if [[ $BUILD_ID =~ [PXY] ]]
+ then
+ touch buildHidden
+ fi
popd
}
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index 3a23c303..44ab09c2 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -11,6 +11,26 @@ export BRANCH=${BRANCH:-master}
export STREAM=${STREAM:-4.4.0}
export BUILD_TYPE=${BUILD_TYPE:-N}
+# If not set be caller, make sure its an empty string
+# as the variable is sometimes used to "complete" a name,
+# such as "repositories${PATCH_BUILD}.txt"
+# (not sure this makes a difference in bash?
+# undefined is same as empty string?)
+export PATCH_BUILD=${PATCH_BUILD:-""}
+
+
+# special POM for patch builds, but by default use POM at root of $REPO_DIR
+# which is default behavior
+if [[ -n ${PATCH_BUILD} ]]
+then
+ export ALT_POM_FILE="-f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/pom.xml"
+ echo "DEBUG: ALT_POM_FILE: $ALT_POM_FILE"
+else
+ export ALT_POM_FILE=""
+ echo "DEBUG: ALT_POM_FILE: None. Using normal default."
+fi
+
+
eclipseStreamMajor=${STREAM:0:1}
export BUILD_ROOT=${BUILD_ROOT:-${BUILD_HOME}/${eclipseStreamMajor}${BUILD_TYPE}}
@@ -69,7 +89,7 @@ MAVEN_BREE=-Pbree-libs
# local, non build.eclipse.org builds (or, test builds) may need to override, and turn off signing.
# otherwwise, we always sign if I or M builds, but not N builds
#
-if [[ $BUILD_TYPE =~ [IMXY] ]]
+if [[ $BUILD_TYPE =~ [IMXYP] ]]
then
SIGNING=${SIGNING:-true}
else
diff --git a/production/master-build.sh b/production/master-build.sh
index e0cb08a9..a5487a33 100644
--- a/production/master-build.sh
+++ b/production/master-build.sh
@@ -138,6 +138,12 @@ if [ "$BUILD_TYPE" = M ]; then
BUILD_TYPE_NAME="Maintenance"
elif [ "$BUILD_TYPE" = N ]; then
BUILD_TYPE_NAME="Nightly (HEAD)"
+elif [ "$BUILD_TYPE" = X ]; then
+ BUILD_TYPE_NAME="Experimental Branch"
+elif [ "$BUILD_TYPE" = Y ]; then
+ BUILD_TYPE_NAME="Experimental Branch"
+elif [ "$BUILD_TYPE" = P ]; then
+ BUILD_TYPE_NAME="Patch"
elif [ "$BUILD_TYPE" = S ]; then
BUILD_TYPE_NAME="Stable (Milestone)"
fi
@@ -303,7 +309,7 @@ else
echo "# (when repository is a branch, which it typcally is)." >> ${buildDirectory}/directory.txt
echo "# " >> ${buildDirectory}/directory.txt
- if [[ $BUILD_TYPE =~ [IMXY] ]]
+ if [[ $BUILD_TYPE =~ [IMXYP] ]]
then
AGGRCOMMIT=$( git rev-parse HEAD )
echo "eclipse.platform.releng.aggregator TAGGED: ${BUILD_ID}" >> ${buildDirectory}/directory.txt
@@ -368,11 +374,13 @@ $SCRIPT_PATH/publish-eclipse.sh $BUILD_ENV_FILE >$logsDirectory/mb080_publish-ec
checkForErrorExit $? "Error occurred during publish-eclipse"
-# We don't promote repo if there was a build failure, it likely doesn't exist.
+# We don't publish repo if there was a build failure, it likely doesn't exist.
if [[ -z "${BUILD_FAILED}" ]]
then
$SCRIPT_PATH/publish-repo.sh $BUILD_ENV_FILE >$logsDirectory/mb083_publish-repo_output.txt
checkForErrorExit $? "Error occurred during publish-repo"
+else
+ echo "No repo published, since BUILD_FAILED"
fi
@@ -395,4 +403,5 @@ fn-write-property-close
# debugging build results or differences between runs, especially on different machines
env 1>$logsDirectory/mb100_all-env-variables_output.txt
+echo "Exiting build with RC code of $buildrc"
exit $buildrc
diff --git a/production/parse-logs.sh b/production/parse-logs.sh
index a2f43a8f..61f43747 100644
--- a/production/parse-logs.sh
+++ b/production/parse-logs.sh
@@ -41,5 +41,5 @@ launcherJar=$( fn-basebuilder-launcher "$basebuilderDir" )
EBuilderDir="$buildDirectory"/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
fn-parse-compile-logs "$BUILD_ID" \
- "$EBuilderDir"/eclipse/buildScripts/eclipse_convert.xml \
+ "${EBuilderDir}/eclipse/buildScripts/eclipse_convert.xml" \
"$buildDirectory" "$launcherJar"
diff --git a/production/publish-eclipse.sh b/production/publish-eclipse.sh
index 180c7268..39929d05 100644
--- a/production/publish-eclipse.sh
+++ b/production/publish-eclipse.sh
@@ -41,7 +41,7 @@ EBuilderDir="$buildDirectory"/eclipse.platform.releng.aggregator/eclipse.platfor
fn-gather-compile-logs "$BUILD_ID" "$aggDir" "$buildDirectory"
fn-parse-compile-logs "$BUILD_ID" \
- "$EBuilderDir"/eclipse/helper.xml \
+ "${EBuilderDir}/eclipse/helper.xml" \
"$buildDirectory" "$launcherJar"
fn-summarize-comparator-logs "$BUILD_ID" \
diff --git a/production/sdk/promotion/startTests.sh b/production/sdk/promotion/startTests.sh
index 22480103..75166772 100755
--- a/production/sdk/promotion/startTests.sh
+++ b/production/sdk/promotion/startTests.sh
@@ -60,7 +60,7 @@ else
exit 1
fi
-if [[ "${buildId}" =~ ([MNI]+)([[:digit:]]*)\-([[:digit:]]*) ]]
+if [[ "${buildId}" =~ ([MNIXYP]+)([[:digit:]]*)\-([[:digit:]]*) ]]
then
# old, simpler way, if we don't do regex and input checkinging
#buildType=${buildId:0:1}
diff --git a/production/sdk/promotion/syncDropLocation.sh b/production/sdk/promotion/syncDropLocation.sh
index d32d6a5a..8ab640ca 100755
--- a/production/sdk/promotion/syncDropLocation.sh
+++ b/production/sdk/promotion/syncDropLocation.sh
@@ -98,7 +98,7 @@ function sendPromoteMail ()
TO=${TO:-"platform-releng-dev@eclipse.org"}
# for initial testing, only to me -- change as desired after initial testing.
- if [[ "${BUILD_KIND}" != "CBI" ]]
+ if [[ "${"${buildId}"}" =~ [PYI] ]]
then
TO="david_williams@us.ibm.com"
fi
@@ -140,7 +140,7 @@ function sendPromoteMail ()
message2="$message2 <p>Equinox downloads: http://${SITE_HOST}/equinox/drops/${buildId}</p>\n"
fi
- if [[ "${BUILD_KIND}" == "CBI" ]]
+ if [[ "${BUILD_KIND}" == "CBI" && "${buildId}" =~ [MI] ]]
then
(
echo "To: ${TO}"
@@ -152,13 +152,14 @@ function sendPromoteMail ()
echo -e "${message1}"
echo "</body></html>"
) | /usr/lib/sendmail -t
- else
+ elif [[ "${BUILD_KIND}" == "CBI" && "${buildId}" =~ [PYX] ]]
+ then
(
echo "To: ${TO}"
echo "From: ${FROM}"
echo "MIME-Version: 1.0"
echo "Content-Type: text/html; charset=utf-8"
- echo "Subject: ${SUBJECT}"
+ echo "Subject: Experimental: ${SUBJECT}"
echo "<html><body>"
echo -e "${message2}"
echo "</body></html>"
diff --git a/production/sdk/startTests.sh b/production/sdk/startTests.sh
index e63d0408..26538cc1 100755
--- a/production/sdk/startTests.sh
+++ b/production/sdk/startTests.sh
@@ -61,7 +61,7 @@ else
exit 1
fi
-if [[ "${buildId}" =~ ([MNI]+)([[:digit:]]*)\-([[:digit:]]*) ]]
+if [[ "${buildId}" =~ ([MNIXYP]+)([[:digit:]]*)\-([[:digit:]]*) ]]
then
# old, simpler way, if we don't do regex and input checkinging
#buildType=${buildId:0:1}
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
index 02851aaf..af288379 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
@@ -11,7 +11,7 @@ ulimit -c unlimited
source localTestsProperties.shsource 2>/dev/null
echo "PWD: $PWD"
-vmcmd=${vmcmd:-/Library/Java/JavaVirtualMachines/jdk1.7.0_25.jdk/Contents/Home/jre/bin/java}
+vmcmd=${vmcmd:-/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java}
# production machine is x86_64, but some local setups may be 32 bit and will need to provide
# this value in localTestsProperties.shsource.
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
index ccc22622..031d6a07 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
@@ -10,7 +10,7 @@
###############################################################################
platform=macosx.cocoa.x86_5.0
# J2SE-6.0=/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java
-J2SE-6.0=/Library/Java/JavaVirtualMachines/jdk1.7.0_25.jdk/Contents/Home/jre/bin/java
+J2SE-6.0=/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=392213
# If this property is set, the actual location and file name
# is computed at test time, but this is assumed to be the
diff --git a/production/testScripts/genTestIndexes.xml b/production/testScripts/genTestIndexes.xml
index fc56174f..66beca09 100644
--- a/production/testScripts/genTestIndexes.xml
+++ b/production/testScripts/genTestIndexes.xml
@@ -11,7 +11,7 @@
<script language="javascript">
var buildId = project.getProperty("buildId");
- var pattern = new RegExp(/^([IMXYNSR])(\d{8})-(\d{4})$/);
+ var pattern = new RegExp(/^([IMXYPNSR])(\d{8})-(\d{4})$/);
var sArray = pattern.exec(buildId);
// sArray 0 is "whole match"
diff --git a/production/testScripts/invokeTestsJSON.xml b/production/testScripts/invokeTestsJSON.xml
index a7af7f47..f641d0c5 100644
--- a/production/testScripts/invokeTestsJSON.xml
+++ b/production/testScripts/invokeTestsJSON.xml
@@ -27,6 +27,8 @@
<echo message="buildId: ${buildId} " />
<echo message="eclipseStream: ${eclipseStream}" />
<echo message="eclipseStreamMajor: ${eclipseStreamMajor}" />
+ <echo message="eclipseStreamMinor: ${eclipseStreamMinor}" />
+ <echo message="buildType: ${buildType}" />
<echo message="BUILD_KIND: ${BUILD_KIND}" />
<echo message="EBUILDER_HASH: ${EBUILDER_HASH}" />
<antcall target="JUnitTests" />
@@ -49,19 +51,19 @@
<antcall target="triggerHudsonTests">
<param
name="job"
- value="ep${eclipseStreamMajor}-unit-lin64" />
+ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-lin64" />
</antcall>
<antcall target="triggerHudsonTests">
<param
name="job"
- value="ep${eclipseStreamMajor}-unit-win32" />
+ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32" />
</antcall>
<antcall target="triggerHudsonTests">
<param
name="job"
- value="ep${eclipseStreamMajor}-unit-mac64" />
+ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64" />
</antcall>
</parallel>
@@ -136,7 +138,7 @@
<script language="javascript">
var buildId = project.getProperty("buildId");
- var pattern = new RegExp(/^([IMXYNSR])(\d{8})-(\d{4})$/);
+ var pattern = new RegExp(/^([IMXYPNSR])(\d{8})-(\d{4})$/);
var sArray = pattern.exec(buildId);
// sArray 0 is "whole match"
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index df2e2bdb..c5af7907 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -112,16 +112,16 @@
<condition property="buildIdOK">
<matches
- pattern="^[IMXYNSR]\d{8}-\d{4}$"
+ pattern="^[IMXYNPSR]\d{8}-\d{4}$"
string="${buildId}" />
</condition>
<fail
- message="buildId variable had unexpected format. Should be of the form [IMXYNSR] 8 digits '-' 4 digits, but was ${buildId}"
+ message="buildId variable had unexpected format. Should be of the form [IMXYNPSR] 8 digits '-' 4 digits, but was ${buildId}"
unless="buildIdOK" />
<script language="javascript">
var buildId = project.getProperty("buildId");
- var pattern = new RegExp(/^([IMXYNSR])(\d{8})-(\d{4})$/);
+ var pattern = new RegExp(/^([IMXYNPSR])(\d{8})-(\d{4})$/);
var sArray = pattern.exec(buildId);
// sArray 0 is "whole match"
diff --git a/production/testScripts/startTests.sh b/production/testScripts/startTests.sh
index 590959d5..a2dc57f3 100755
--- a/production/testScripts/startTests.sh
+++ b/production/testScripts/startTests.sh
@@ -116,7 +116,7 @@ else
exit 1
fi
-if [[ "${buildId}" =~ ([MNI]+)([[:digit:]]*)\-([[:digit:]]*) ]]
+if [[ "${buildId}" =~ ([MNIXYP]+)([[:digit:]]*)\-([[:digit:]]*) ]]
then
# old, simpler way, if we don't do regex and input checkinging
#buildType=${buildId:0:1}

Back to the top