diff options
| author | David Williams | 2014-11-10 00:36:37 +0000 |
|---|---|---|
| committer | David Williams | 2014-11-10 00:36:37 +0000 |
| commit | 81d7b216dfad707841eb0dec2f0ec1a69bf531b7 (patch) | |
| tree | e63b5fa29343a09b65ad27c5b62d6454d4e95355 | |
| parent | 958e419a1b8b3d4ce3cb6d42fe4216eade99d654 (diff) | |
| download | eclipse.platform.releng.aggregator-81d7b216dfad707841eb0dec2f0ec1a69bf531b7.tar.gz eclipse.platform.releng.aggregator-81d7b216dfad707841eb0dec2f0ec1a69bf531b7.tar.xz eclipse.platform.releng.aggregator-81d7b216dfad707841eb0dec2f0ec1a69bf531b7.zip | |
Bug 444243 - Improve scripts to handle performance tests
67 files changed, 549 insertions, 459 deletions
diff --git a/bootstrap/description.txt b/bootstrap/description.txt index 364022105..fb18580f7 100644 --- a/bootstrap/description.txt +++ b/bootstrap/description.txt @@ -4,7 +4,7 @@ These files should only exist in 'master'. They should never differ between BRAN These go in your BUILD_HOME directory (by export/copy or wget) and they are simply to "get things started", such as via cronjobs, etc. Such as for Platform builds, in /shared/eclipse/builds. -The bootstrap.shsource file is responsible for getting all the other scripts +The bootstrap.shsource file is responsible for getting all the other scripts that are required, from the right BRANCH, and starting a build for that BRANCH. diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 112becba5..f062fb9de 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -35,23 +35,23 @@ See bug 328139. --> <releaseName>Mars</releaseName> - <!-- - The releaseNumbers below, for SDK and Platform, might be - thought of as the "marketing number" or "branding number", - and in fact are used in the branding bundle of the corresponding products. - In practice, the SDK number and Platform number are always the same, - though in theory they would not always have to be ... so we'll use - separate numbers. Also in practice, they are almost always the same as - or nearly the same as the "product feature" numbers, but for example, for - the initial release, some prefer we not use the trailing zero, but instead - merely "4.5, instead of 4.5.0". And, hypothetically, there might be a time - in the future when the platform for a new release was "merely service", - but we'd still want the "marketing number" to be increased to reflect + <!-- + The releaseNumbers below, for SDK and Platform, might be + thought of as the "marketing number" or "branding number", + and in fact are used in the branding bundle of the corresponding products. + In practice, the SDK number and Platform number are always the same, + though in theory they would not always have to be ... so we'll use + separate numbers. Also in practice, they are almost always the same as + or nearly the same as the "product feature" numbers, but for example, for + the initial release, some prefer we not use the trailing zero, but instead + merely "4.5, instead of 4.5.0". And, hypothetically, there might be a time + in the future when the platform for a new release was "merely service", + but we'd still want the "marketing number" to be increased to reflect "a new yearly release". --> <releaseNumberSDK>4.5</releaseNumberSDK> <releaseNumberPlatform>4.5</releaseNumberPlatform> - + <tycho.version>0.21.0</tycho.version> <tycho-extras.version>0.21.0</tycho-extras.version> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml index 317d2fa44..34fd8e789 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml @@ -24,12 +24,12 @@ <properties> <timestamp>${buildTimestamp}</timestamp> - <!-- - Compare these doc locations with similar code in - ...tychoeclipsebuilder/eclipse/helper.xml around line 275 - We don't, use ${env.AGGR_DIR} as we do there, in that post-production-build step, - since that'd make "local builds" harder for casual users. - Caution: using relative directories like can be fragile. There might be + <!-- + Compare these doc locations with similar code in + ...tychoeclipsebuilder/eclipse/helper.xml around line 275 + We don't, use ${env.AGGR_DIR} as we do there, in that post-production-build step, + since that'd make "local builds" harder for casual users. + Caution: using relative directories like can be fragile. There might be a better way? --> <platform.doc.isv.javadoc>../../eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/doc.bin.log</platform.doc.isv.javadoc> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties index eeafd6eb0..cf741340d 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties @@ -1,6 +1,6 @@ # variables needed to run tests, if not provided "externally" buildId=${buildId} -# Note, in most places, we expect "eclipseStream" to be all three digits, -# but "releaseNumberSDK" is purposely only 2 digits, for "the first" release, +# Note, in most places, we expect "eclipseStream" to be all three digits, +# but "releaseNumberSDK" is purposely only 2 digits, for "the first" release, # such as "4.5" instead of "4.5.0". eclipseStream=${releaseNumberSDK} diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml index 864c9e8f8..276df17d3 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml @@ -186,7 +186,7 @@ </execution> <!-- We add emf features to our repo, since we "require" (not "include") them, but are required to build (or pull) against "just" the platform repository. - We specify in a seperate step than above because unlike the others, there are + We specify in a separate step than above because unlike the others, there are af few IUs, even the "base" repo, that we do not want. --> <execution> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml index dcebf9776..2318cd26b 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml @@ -85,7 +85,7 @@ <condition property="testType" value="perf" else="test"> <contains string="${job}" substring="-perf-" /> </condition> - + <property name="xmlDirectoryName" value="${result}/${testType}results/xml" /> <property name="dropDirectoryName" value="${result}" /> <property name="testResultsTemplateFileName" value="${basedir}/templateFiles/${testTemplate}" /> @@ -103,7 +103,6 @@ buildType="${buildType}" dropTokenList="${dropTokenList}" platformIdentifierToken="${platformIdentifierToken}" - platformSpecificTemplateList="${platformSpecificTemplateList}" dropHtmlFileName="${indexFileName}" xmlDirectoryName="${xmlDirectoryName}" dropDirectoryName="${dropDirectoryName}" diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml index f12eb422e..421a6dbf6 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml @@ -105,9 +105,10 @@ <property name="buildTools.feature" value="org.eclipse.releng.build.tools.feature.feature.group" /> + <!-- value="1.0.0.v20140325-1404" --> <property name="buildTools.feature.version" - value="1.0.0.v20140325-1404" /> + value="" /> <property name="webtools.feature" value="org.eclipse.wtp.releng.tools.feature.feature.group" /> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml index fc99f39ed..1bcf9894f 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml @@ -314,9 +314,6 @@ name="platformIdentifierToken" value="%platform%" /> <property - name="platformSpecificTemplateList" - value="Windows,${publishingContent}/templateFiles/platform.php.template,winPlatform.php;Linux,${publishingContent}/templateFiles/platform.php.template,linPlatform.php;Solaris,${publishingContent}/templateFiles/platform.php.template,solPlatform.php;AIX,${publishingContent}/templateFiles/platform.php.template,aixPlatform.php;Macintosh,${publishingContent}/templateFiles/platform.php.template,macPlatform.php;HP-UX,${publishingContent}/templateFiles/platform.php.template,hpuxPlatform.php" /> - <property name="indexFileName" value="index.php" /> <property diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildNotes.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildNotes.php index ad8e62b43..ceb909a3f 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildNotes.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildNotes.php @@ -33,7 +33,7 @@ while ($anEntry = $aDirectory->read()) { } } echo "</ul>"; -aDirectory.closedir(); +$aDirectory->close(); ?> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/coverage.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/coverage.php index 07eaa4f6a..49cc63475 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/coverage.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/coverage.php @@ -19,7 +19,7 @@ function listLogs($myDir) { } } - aDirectory.closedir(); + $aDirectory->close(); sort($entries); if ($index < 0) { diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php index 3a3b34376..e56740876 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php @@ -2,10 +2,10 @@ // This file is "static" for now, but eventually may compute and upload // this file more dynamically. -// BUT, for the moment, the order is important. We expect the order here -// to be the same order as displayed on test results summary page. (And, +// BUT, for the moment, the order is important. We expect the order here +// to be the same order as displayed on test results summary page. (And, // while not sure how that can be controlled, eventually, in either case -// we'd probably want a consistent ordering. +// we'd probably want a consistent ordering. $expectedTestConfigs = array(); $expectedTestConfigs[]="linux.gtk.x86_64_8.0"; diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php index 46d24f898..5dbf19a67 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php @@ -1,13 +1,13 @@ <?php // from static -/* +/* This funtion returns a proper "linux time stamp" so we can compute time -elapsed since build started ... and give different messages if we exceed -certain amounts. +elapsed since build started ... and give different messages if we exceed +certain amounts. -We expect the value to be in the form as saved in "buildproperties.php", -namely +We expect the value to be in the form as saved in "buildproperties.php", +namely $TIMESTAMP = "20140706-2000"; */ function timeOfBuild ($timestamp) { @@ -44,11 +44,11 @@ function testTimeOfBuild() { timeOfBuild("20144101-0001"); } /* -This function was originally copied from 'createIndex4x.php'. -Its purpose is to return number of "test runs completed", based -on the names of "console logs" that are present in ./testResults/consolelogs +This function was originally copied from 'createIndex4x.php'. +Its purpose is to return number of "test runs completed", based +on the names of "console logs" that are present in ./testResults/consolelogs directory. - */ + */ function calcTestConfigsRan($testResultsDirName) { @@ -56,9 +56,9 @@ function calcTestConfigsRan($testResultsDirName) { global $testResults; $boxes=0; - // the include file, testConfigs.php defines 'testConfigs' array, - // which consists of strings defining what platforms and vms we test. - // For example, a testConfigs.php file might consist of + // the include file, testConfigs.php defines 'testConfigs' array, + // which consists of strings defining what platforms and vms we test. + // For example, a testConfigs.php file might consist of // <?php // $expectedTestConfigs = array(); // $expectedTestConfigs[]="linux.gtk.x86_64_8.0"; @@ -85,7 +85,7 @@ function calcTestConfigsRan($testResultsDirName) { } } - // will be empty until there is at least one test result uploaded? + // will be empty until there is at least one test result uploaded? if (empty($testResultsDirName)) { // contrived code to mean "no results yet" $boxes = -3; @@ -100,7 +100,7 @@ function calcTestConfigsRan($testResultsDirName) { for ($i = 0 ; $i < count($expectedTestConfigs) ; $i++) { if (strncmp($file, $expectedTestConfigs[$i], count($expectedTestConfigs[$i])) == 0) { $boxes++; - // our way of matching job names, with test configs, is very limited, + // our way of matching job names, with test configs, is very limited, // at the moment ... just looking for three letter match between the two. $keyMatchStrings = array("lin","win","mac"); foreach ($keyMatchStrings as $keyMatch) { @@ -115,7 +115,7 @@ function calcTestConfigsRan($testResultsDirName) { foreach ($testResultsSummaryFiles as $summFileName) { // echo "DEBUG: processing $summFileName<br />"; if (strpos($summFileName, $keyMatch) !== FALSE) { - //echo "DEBUG: found matching summary file: $summFileName<br />"; + //echo "DEBUG: found matching summary file: $summFileName<br />"; $xmlResults = simplexml_load_file($summFileName); $testResults[$expectedTestConfigs[$i]]["duration"]=$xmlResults->duration; $testResults[$expectedTestConfigs[$i]]["failCount"]=$xmlResults->failCount; @@ -136,12 +136,12 @@ function calcTestConfigsRan($testResultsDirName) { } /* -This function was originally copied from 'createIndex4x.php', where -the function was named 'printBuildColumns'. It's be heavily modified -to be used on individual build DL page. +This function was originally copied from 'createIndex4x.php', where +the function was named 'printBuildColumns'. It's be heavily modified +to be used on individual build DL page. -Its purpose is to return a short summary of "state of the tests". - */ +Its purpose is to return a short summary of "state of the tests". + */ function printTestSummaryStatus() { include_once("buildproperties.php"); diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests index 1c213922e..a933ec29c 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests @@ -1,14 +1,14 @@ -<?php +<?php -// This is purely an example, to use as reference while in workspace. +// This is purely an example, to use as reference while in workspace. // The actual file, named 'buildproperties.php, // is produced during the build, and so will not only be different values for each build, // but will likely have variables -// some and go as the build changes over the months and years. So, for +// some and go as the build changes over the months and years. So, for // accurate reference, be sure to get // a recent copy. This was copied circa July 8, 2014. -// properties written for N20140707-2000 +// properties written for N20140707-2000 $PATH = "/shared/common/jdk1.7.0-latest/bin:/shared/common/apache-maven-3.1.1/bin:/shared/common/apache-ant-1.9.2/bin:/usr/local/bin:/usr/bin:/bin:/opt/buildhomes/e4Build/bin"; $INITIAL_ENV_FILE = "/shared/eclipse/builds/4N/production/build_eclipse_org.shsource"; $BUILD_ROOT = "/shared/eclipse/builds/4N"; @@ -58,5 +58,5 @@ $EBUILDER_HASH = "09bc7ec37b451629f290cc4c9f11686686472570"; $POM_UPDATES = "<li><a href='rt.equinox.framework.diff'>rt.equinox.framework</a></li>"; $API_PREV_REF_LABEL = "4.4.0"; $API_FREEZE_REF_LABEL = " "; -// finished properties for N20140707-2000 +// finished properties for N20140707-2000 ?> 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 581acd882..af7f3277b 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template @@ -147,9 +147,9 @@ if (isset($testbuildonly) && ($testbuildonly)) { echo "</td></tr>\n"; } -// Use of "BUILD_ID" should work for milestones, and releases, but would require a "copy" -// being made, say for "4.5RC4" during that period we have prepared final bits, but have not -// made visible yet (if we want "N&N" visible from RC build). +// Use of "BUILD_ID" should work for milestones, and releases, but would require a "copy" +// being made, say for "4.5RC4" during that period we have prepared final bits, but have not +// made visible yet (if we want "N&N" visible from RC build). if (file_exists("news/")) { echo "<tr><td width=\"75%\"><font size=\"+1\">"; @@ -215,9 +215,9 @@ relating to its results and unit tests. <?php - // for current (modern) builds, test results are always in + // for current (modern) builds, test results are always in // 'testresults'. That directory only exists after first results - // have finished and been "published". + // have finished and been "published". if (file_exists("testresults")) { $testResultsDirName="testresults"; } elseif (file_exists("results")) { @@ -226,13 +226,13 @@ relating to its results and unit tests. $testResultsDirName=""; } - // The failed is given a value by the "generate Index" tasks, + // The failed is given a value by the "generate Index" tasks, // but it is supplimented by "nBoxes" and "count(expectedTestConfigs)" // BUT, we want to maintain ability to override color with presence // of 'overrideTestColor' marker file. $boxes=calcTestConfigsRan($testResultsDirName); - if ($boxes < 0 ) { + if ($boxes < 0 ) { $boxesDisplay = 0; } else { $boxesDisplay = $boxes; @@ -246,28 +246,28 @@ relating to its results and unit tests. /* -3 is special code meaning no testResults directory exists yet. */ - if (($boxes == -3) || ($testResultsStatus === "pending")) { + if (($boxes == -3) || ($testResultsStatus === "pending")) { $linkColor = 'inherit'; echo "<li>Integration and unit tests are pending.</li>\n"; } - else { + else { if ($testResultsStatus === "successful") { $linkColor = 'green'; - } + } elseif ($testResultsStatus === "failed") { /* note we don't override 'inherit' cases, just 'failed' cases. */ if (file_exists("overrideTestColor")) { $linkColor='green'; } else { $linkColor = 'red'; - } - } + } + } else { /* This is a fall-through, unexpected case ... just in case testResultsStatus is something we don't expect. */ $testColor='inherit'; - } + } echo "<li>View the <a style=\"color:${linkColor};text-decoration:none\" title=\"Link test results.\" href=\"testResults.php\">test results for the current build.</a>\n"; - } + } echo "<table class=testTable>\n"; echo "<caption>".$boxesDisplay." of ".count($expectedTestConfigs)." test configurations are complete.</caption> \n"; @@ -284,7 +284,7 @@ relating to its results and unit tests. $duration = $testRes['duration']; if (file_exists("overrideTestColor")) { $linkColor='green'; - } + } else { if ($failed > 0) { /* note we don't override 'inherit' cases, just 'failed'. */ @@ -292,29 +292,29 @@ relating to its results and unit tests. $linkColor='green'; } else { $linkColor = 'red'; - } + } } else { $linkColor='green'; - } - } + } + } echo "<tr>\n"; echo "<td style=\"text-align:left\">\n"; echo "<a style=\"color:${linkColor};text-decoration:none\" href=\"testResults.php\">".$config."</a>"; echo "</td>\n"; echo "<td>$failed</td><td>$passed</td><td>$total</td><td>$duration</td>\n"; echo "</tr>\n"; - } + } else { /* Yes, all configs intentionally links, since all go to the same place, but if no results yet, would not look like one. */ - $linkColor = 'inherit'; + $linkColor = 'inherit'; echo "<tr>\n"; echo "<td style=\"text-align:left\">\n"; echo "<a style=\"color:${linkColor};text-decoration:none\" href=\"testResults.php\">".$config."</a>"; echo "</td>\n"; echo "<td> </td><td> </td><td> </td><td> </td>\n"; echo "</tr>\n"; - } - } + } + } echo "</table>\n"; /* table is contained in last link item */ echo "</li>\n"; @@ -435,9 +435,9 @@ relating to its results and unit tests. // 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 === "M" && $isRC ) { + if ($BUILD_TYPE === "M" && $isRC ) { $STREAM_REPO_NAME=$STREAM_MAJOR.".".$STREAM_MINOR."milestones"; - } + } else { 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"; @@ -498,42 +498,42 @@ relating to its results and unit tests. <tr><td><div class="homeitem3col"> <h3><a name="EclipseSDK"> Eclipse SDK <a href="details.html#EclipseSDK"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table BORDER=0 CELLSPACING=2 CELLPADDING=0 WIDTH="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %sdk% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="JUnitPlugin"> JUnit Plugin Tests and Automated Testing Framework <a href="details.html#JUnitPlugin"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %tests% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="ExamplePlugins"> Example Plug-ins <a href="details.html#ExamplePlugins"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %example% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="RCPRuntime"> RCP Runtime Binary <a href="details.html#RCPRuntime"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %rcpruntime% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="RCPSDK"> RCP SDK <a href="details.html#RCPSDK"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %rcpsdk% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="DeltaPack"> DeltaPack <a href="details.html#DeltaPack"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %deltapack% </table> </div></td></tr> @@ -541,70 +541,70 @@ relating to its results and unit tests. <tr><td><div class="homeitem3col"> <h3><a name="PlatformRuntime"> Platform Runtime Binary <a href="details.html#PlatformRuntime"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %runtime% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="JDTRuntime"> JDT Runtime Binary <a href="details.html#JDTRuntime"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %jdt% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="JDTSDK"> JDT SDK <a href="details.html#JDTSDK"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %jdtsdk% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="JDTCORE"> JDT Core Batch Compiler <a href="details.html#JDTCORE"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %jdtc% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="PDERuntime"> PDE Runtime Binary <a href="details.html#PDERuntime"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %pde% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="PDESDK"> PDE SDK <a href="details.html#PDESDK"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> %pdesdk% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="CVSRuntime"> CVS Client Runtime Binary <a href="details.html#CVSRuntime"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %cvs% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="CVSSDK"> CVS Client SDK <a href="details.html#CVSSDK"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> %cvssdk% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="SWT"> SWT Binary and Source <a href="details.html#SWT"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %swt% </table> </div></td></tr> <tr><td><div class="homeitem3col"> <h3><a name="org.eclipse.releng"> org.eclipse.releng.tools plug-in <a href="details.html#org.eclipse.releng"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" > -<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"> </div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> +<tr> <td width="36%"><b>Platform</b></td><?php column($servername); ?> </tr> %relengtools% </table> </div></td></tr> </table> @@ -617,8 +617,6 @@ relating to its results and unit tests. <li><a href="http://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li> <li>Downloads provided under the <a href="http://www.eclipse.org/legal/epl/notice.html">Eclipse Foundation Software User Agreement</a></li> </ul> -<p>Copyright © 2006-2013 The Eclipse Foundation. All Rights -Reserved</p> </div> </body> </html> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/perfResults.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/perfResults.php.template index 5874de516..df3ad1ee5 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/perfResults.php.template +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/perfResults.php.template @@ -3,7 +3,7 @@ <?php //ini_set("display_errors", "true"); //error_reporting (E_ALL); -include ('buildproperties.php'); +include ('../buildproperties.php'); include ('testConfigs.php'); if (array_key_exists("SERVER_NAME", $_SERVER)) { $servername = $_SERVER["SERVER_NAME"]; diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template index 033c5afc6..aed4dcf4b 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template @@ -9,7 +9,7 @@ Performance fingerprint</FONT></B></TD></TR></TABLE> <?php -include("buildproperties.php"); +include("../buildproperties.php"); $performance = dir("."); $index=0; @@ -61,12 +61,12 @@ Detailed performance data grouped by scenario prefix</FONT></B></TD></TR></TABLE } ?> <p><BR><BR><TABLE BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" > <TR> <TD ALIGN=LEFT VALIGN=TOP COLSPAN="3" BGCOLOR="#0080C0"><B><FONT COLOR="#FFFFFF" FACE="Arial,Helvetica">Performance -Unit Test Results for <?php echo "$buildName"; ?> </FONT></B></TD></TR> </TABLE><P></P><TABLE BORDER="0"> +Unit Test Results for <?php echo "$BUILD_ID"; ?> </FONT></B></TD></TR> </TABLE><P></P><TABLE BORDER="0"> </TABLE>** test errors or failures here do not produce Red X's for now**<TABLE WIDTH="77%" BORDER="1"> <TR> <TD WIDTH="81%"><B>Tests Performed</B></TD><TD WIDTH="19%"><B>Errors & Failures</B></TD></TR> %testresults% </TABLE><BR> <A NAME="consolelog"></A><TABLE BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" > <TR> <TD ALIGN=LEFT VALIGN=TOP COLSPAN="3" BGCOLOR="#0080C0"><B><FONT COLOR="#FFFFFF" FACE="Arial,Helvetica"> -Console output logs <?php echo "$buildName"; ?> </FONT></B></TD></TR></TABLE><P> +Console output logs <?php echo "$BUILD_ID"; ?> </FONT></B></TD></TR></TABLE><P> <?php $hasNotes = false; $aDirectory = dir("consolelogs"); @@ -78,7 +78,7 @@ Console output logs <?php echo "$buildName"; ?> </FONT></B></TD></TR></TABLE><P> } } - aDirectory.closedir(); + $aDirectory->close(); sort($logentries); for ($i = 0; $i < $index; $i++) { diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/utilityFunctions.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/utilityFunctions.php index fe8f75e7d..7c7ce5b02 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/utilityFunctions.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/utilityFunctions.php @@ -1,13 +1,13 @@ <?php -/* +/* This funtion returns a proper "linux time stamp" so we can compute time -elapsed since build started ... and give different messages if we exceed -certain amounts. +elapsed since build started ... and give different messages if we exceed +certain amounts. -We expect the value to be in the form as saved in "buildproperties.php", -namely +We expect the value to be in the form as saved in "buildproperties.php", +namely $TIMESTAMP = "20140706-2000"; */ function timeOfBuild ($timestamp) { @@ -44,11 +44,11 @@ function testTimeOfBuild() { timeOfBuild("20144101-0001"); } /* -This function was originally copied from 'createIndex4x.php'. -Its purpose is to return number of "test runs completed", based -on the names of "console logs" that are present in ./testResults/consolelogs +This function was originally copied from 'createIndex4x.php'. +Its purpose is to return number of "test runs completed", based +on the names of "console logs" that are present in ./testResults/consolelogs directory. - */ + */ function calcTestConfigsRan($testResultsDirName) { @@ -56,9 +56,9 @@ function calcTestConfigsRan($testResultsDirName) { global $testResults; $boxes=0; - // the include file, testConfigs.php defines 'testConfigs' array, - // which consists of strings defining what platforms and vms we test. - // For example, a testConfigs.php file might consist of + // the include file, testConfigs.php defines 'testConfigs' array, + // which consists of strings defining what platforms and vms we test. + // For example, a testConfigs.php file might consist of // <?php // $expectedTestConfigs = array(); // $expectedTestConfigs[]="linux.gtk.x86_64_8.0"; @@ -85,7 +85,7 @@ function calcTestConfigsRan($testResultsDirName) { } } - // will be empty until there is at least one test result uploaded? + // will be empty until there is at least one test result uploaded? if (empty($testResultsDirName)) { // contrived code to mean "no results yet" $boxes = -3; @@ -100,7 +100,7 @@ function calcTestConfigsRan($testResultsDirName) { for ($i = 0 ; $i < count($expectedTestConfigs) ; $i++) { if (strncmp($file, $expectedTestConfigs[$i], count($expectedTestConfigs[$i])) == 0) { $boxes++; - // our way of matching job names, with test configs, is very limited, + // our way of matching job names, with test configs, is very limited, // at the moment ... just looking for three letter match between the two. $keyMatchStrings = array("lin","win","mac"); foreach ($keyMatchStrings as $keyMatch) { @@ -115,7 +115,7 @@ function calcTestConfigsRan($testResultsDirName) { foreach ($testResultsSummaryFiles as $summFileName) { // echo "DEBUG: processing $summFileName<br />"; if (strpos($summFileName, $keyMatch) !== FALSE) { - //echo "DEBUG: found matching summary file: $summFileName<br />"; + //echo "DEBUG: found matching summary file: $summFileName<br />"; $xmlResults = simplexml_load_file($summFileName); $testResults[$expectedTestConfigs[$i]]["duration"]=$xmlResults->duration; $testResults[$expectedTestConfigs[$i]]["failCount"]=$xmlResults->failCount; @@ -136,12 +136,12 @@ function calcTestConfigsRan($testResultsDirName) { } /* -This function was originally copied from 'createIndex4x.php', where -the function was named 'printBuildColumns'. It's be heavily modified -to be used on individual build DL page. +This function was originally copied from 'createIndex4x.php', where +the function was named 'printBuildColumns'. It's be heavily modified +to be used on individual build DL page. -Its purpose is to return a short summary of "state of the tests". - */ +Its purpose is to return a short summary of "state of the tests". + */ function printTestSummaryStatus() { include_once("buildproperties.php"); diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml index ad0990fc1..f4491b000 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml @@ -17,7 +17,7 @@ <platform id="SAG" name="AIX (PPC/GTK+)" fileName="eclipse-SDK-@build@-aix-gtk-ppc.zip"></platform> <platform id="SAGPPC64" name="AIX (PPC64/GTK+)" fileName="eclipse-SDK-@build@-aix-gtk-ppc64.zip"></platform> <platform id="SMCC64" name="Mac OSX (Mac/Cocoa/x86_64)" fileName="eclipse-SDK-@build@-macosx-cocoa-x86_64.tar.gz"></platform> - + <!-- <platform id="SAA2" name='Source Build (Source in .zip) (<a href="srcIncludedBuildInstructions.html">instructions</a>)' fileName="eclipse-sourceBuild-srcIncluded-@build@.zip"></platform> <platform id="SAA" name='Source Build (Source fetched via CVS) (<a href="srcFetchBuildInstructions.html">instructions</a>)' fileName="eclipse-sourceBuild-srcFetch-@build@.zip"></platform> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/testMacFamilyArch.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/testMacFamilyArch.xml index c661b32bb..61f096674 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/testMacFamilyArch.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/testMacFamilyArch.xml @@ -1,7 +1,7 @@ <project name="testFamilies" default="testFamilies"> <target name="testFamilies"> - <!-- + <!-- <echo message="family ${os.name}" /> <condition property="familyValue" value="mac"> @@ -29,4 +29,4 @@ </condition> <echo message="platformArchive: ${platformArchive}" /> </target> -</project>
\ No newline at end of file +</project>
\ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml index 01362587b..878cd6df7 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml @@ -128,7 +128,7 @@ </execution> </executions> </plugin> - <!-- + <!-- <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-macsigner-plugin</artifactId> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/helper.xml index f181a2d5a..629f35000 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/helper.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/helper.xml @@ -100,7 +100,7 @@ <!-- provisioning removed per bug 368488 dropTokenList="%equinox%,%framework%,%extrabundles%,%other%,%provisioning%,%launchers%,%osgistarterkits%" --> - <indexResults isBuildTested="false" buildType="${buildType}" dropTokenList="%equinox%,%framework%,%extrabundles%,%other%,%launchers%,%osgistarterkits%" platformIdentifierToken="%platform%" platformSpecificTemplateList="" dropHtmlFileName="index.php" xmlDirectoryName="${postingDirectory}/testresults/xml" dropDirectoryName="${equinoxPostingDirectory}/${buildDir}" testResultsTemplateFileName="${eqpublishingContent}/templateFiles/testResults.php.template" dropTemplateFileName="${eqpublishingContent}/templateFiles/index.php.template" testResultsHtmlFileName="testResults.php" hrefTestResultsTargetPath="../../../downloads/drops/${buildDir}/testresults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${equinoxPostingDirectory}/${buildDir}/compilelogs" testManifestFileName="${eqpublishingContent}/testManifest.xml" /> + <indexResults isBuildTested="false" buildType="${buildType}" dropTokenList="%equinox%,%framework%,%extrabundles%,%other%,%launchers%,%osgistarterkits%" platformIdentifierToken="%platform%" dropHtmlFileName="index.php" xmlDirectoryName="${postingDirectory}/testresults/xml" dropDirectoryName="${equinoxPostingDirectory}/${buildDir}" testResultsTemplateFileName="${eqpublishingContent}/templateFiles/testResults.php.template" dropTemplateFileName="${eqpublishingContent}/templateFiles/index.php.template" testResultsHtmlFileName="testResults.php" hrefTestResultsTargetPath="../../../downloads/drops/${buildDir}/testresults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${equinoxPostingDirectory}/${buildDir}/compilelogs" testManifestFileName="${eqpublishingContent}/testManifest.xml" /> </target> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml index 3ac7fccfe..ae784b2f6 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml @@ -93,7 +93,7 @@ </execution> </executions> </plugin> - <!-- + <!-- <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-macsigner-plugin</artifactId> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml index 70585af81..22cd1ef52 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml @@ -101,7 +101,7 @@ </execution> </executions> </plugin> - <!-- + <!-- <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-macsigner-plugin</artifactId> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/forceQualifierUpdate.txt index 258383f55..52647d376 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/forceQualifierUpdate.txt +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/forceQualifierUpdate.txt @@ -10,4 +10,4 @@ Bug 434815 - [Mac] Luna M7 doesn't launch without JRE 6, Bug 434815 - [Mac] Luna M7 doesn't launch without JRE 6,redux Bug 434619 - Switching to GTK+ 2/3 should be easier for products (follow-up) Bug 442290 - Add ppc64le support into 4.5 build -Bug 444051 - Comparator error in I20140914-2000 build - again.
\ No newline at end of file +Bug 444051 - Comparator error in I20140914-2000 build - again.
\ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml index 616a59beb..0804cd1ed 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml @@ -100,7 +100,7 @@ </execution> </executions> </plugin> - <!-- + <!-- <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-macsigner-plugin</artifactId> diff --git a/production/bashUtilities.shsource b/production/bashUtilities.shsource index 6247fc3bf..ad30df2a9 100644 --- a/production/bashUtilities.shsource +++ b/production/bashUtilities.shsource @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# General purpose utilities that are only related to bash (not +# General purpose utilities that are only related to bash (not # the build, per se. # A general purpose utility to check number of arguments match @@ -108,11 +108,11 @@ checkForErrorExit () fi } -# A general purpose utility to check if variable is -# undefinded or empty string and exit if so, +# A general purpose utility to check if variable is +# undefinded or empty string and exit if so, # printing a useful diagnosic trace if variable was empty. -# NOTE: only the variable NAME should be passed as argument, -# note its value. Such as +# NOTE: only the variable NAME should be passed as argument, +# note its value. Such as # assertNotEmpty BUILD_ID # not # assertNotEmpty $BUILD_ID @@ -123,13 +123,13 @@ assertNotEmpty () #echo "DEBUG: VAR_NAME: $VAR_NAME" >&2 #echo "DEBUG: \$VAR_NAME: ${!VAR_NAME}" >&2 if [[ -z "${!VAR_NAME}" ]] - then - printf "\n\tPROGRAM ERROR: %s\n" "${VAR_NAME} was unexpectedly empty or undefined." + then + printf "\n\tPROGRAM ERROR: %s\n" "${VAR_NAME} was unexpectedly empty or undefined." printf "\t%s\n\n" "in ${FUNCNAME[1]}, called from line number ${BASH_LINENO[0]} in ${BASH_SOURCE[1]}." exit 1 else printf "\n\t%s:\t%s\n" "${VAR_NAME}" "${!VAR_NAME}" - fi + fi } diff --git a/production/bootstrapVariables.shsource b/production/bootstrapVariables.shsource index b58f31368..8277ce00c 100644 --- a/production/bootstrapVariables.shsource +++ b/production/bootstrapVariables.shsource @@ -10,7 +10,7 @@ fi source "${SCRIPT_PATH}/bashUtilities.shsource" -# USAGE: fn-git-cache BUILD_ROOT +# USAGE: fn-git-cache BUILD_ROOT # ROOT: /shared/eclipse/builds/${major}${type} fn-git-cache () { @@ -129,6 +129,6 @@ fn-build-dir () chmod -c g+s "${buildDirectory}" else echo "buildDirectory was already defined as $buildDirectory" - fi + fi diff --git a/production/build-functions.shsource b/production/build-functions.shsource index 6e2176be7..3816107d3 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# General purpose utilities related to git and similar, +# General purpose utilities related to git and similar, # to be sourced where needed source ${SCRIPT_PATH}/bashUtilities.shsource @@ -1217,7 +1217,7 @@ fn-write-property-init () # nothing really required for bash shsource, but we'll put in some niceties echo "#!/usr/bin/env bash" > $BUILD_ENV_FILE echo "# properties written for $BUILD_ID" >> $BUILD_ENV_FILE - # PHP, suitable for direct "include": needs to start and end with <?php ... + # PHP, suitable for direct "include": needs to start and end with <?php ... echo "<?php " > $BUILD_ENV_FILE_PHP echo "// properties written for $BUILD_ID " >> $BUILD_ENV_FILE_PHP # standard properties file: nothing special required @@ -1233,10 +1233,10 @@ fn-write-property-close () if [[ $? != 0 ]]; then return 1; fi # nothing really required for bash shsource, but we'll put in some niceties echo "# finished properties for $BUILD_ID" >> $BUILD_ENV_FILE - # PHP, suitable for direct "include": needs to start and end with <?php ... + # PHP, suitable for direct "include": needs to start and end with <?php ... # Note: technically best not to use closing ?> for an 'include' echo "// finished properties for $BUILD_ID " >> $BUILD_ENV_FILE_PHP - + # standard properties file: nothing special required echo "! finshed properties for $BUILD_ID" >> $BUILD_ENV_FILE_PROP diff --git a/production/buildScriptsUnitTests/description.txt b/production/buildScriptsUnitTests/description.txt index d4f97cab0..f91296487 100644 --- a/production/buildScriptsUnitTests/description.txt +++ b/production/buildScriptsUnitTests/description.txt @@ -1,4 +1,4 @@ -These tests are not ran automatically (yet), but handy -place to store the small tests that can be ran from -command line to make sure "build functions" work as -expected. +These tests are not ran automatically (yet), but handy +place to store the small tests that can be ran from +command line to make sure "build functions" work as +expected. diff --git a/production/buildScriptsUnitTests/testAssertNotEmpty1.sh b/production/buildScriptsUnitTests/testAssertNotEmpty1.sh index 33a6397c7..bba956cf8 100755 --- a/production/buildScriptsUnitTests/testAssertNotEmpty1.sh +++ b/production/buildScriptsUnitTests/testAssertNotEmpty1.sh @@ -5,4 +5,4 @@ source bashUtilities.shsource T1= assertNotEmpty T1 -echo "Should NOT see this line" +echo "Should NOT see this line" diff --git a/production/buildScriptsUnitTests/testAssertNotEmpty2.sh b/production/buildScriptsUnitTests/testAssertNotEmpty2.sh index 83977f847..917e14ab1 100755 --- a/production/buildScriptsUnitTests/testAssertNotEmpty2.sh +++ b/production/buildScriptsUnitTests/testAssertNotEmpty2.sh @@ -5,7 +5,7 @@ source bashUtilities.shsource T1="some value" assertNotEmpty T1 -echo "Should see this line" +echo "Should see this line" function testDiagMsg { diff --git a/production/downloadsites/eclipse/downloads/DL.header.php.html b/production/downloadsites/eclipse/downloads/DL.header.php.html index dd21c4449..72f6341ff 100644 --- a/production/downloadsites/eclipse/downloads/DL.header.php.html +++ b/production/downloadsites/eclipse/downloads/DL.header.php.html @@ -23,7 +23,7 @@ <![endif]--> <style> - td, th + td, th { padding: 5px; text-align: left; @@ -49,17 +49,17 @@ background-color: #76708C; color: #FFFFFF; } - td.name, th.name + td.name, th.name { width:15%; } - td.status, th.status + td.status, th.status { width:25%; } - td.date, th.date + td.date, th.date { width:40%; } diff --git a/production/downloadsites/eclipse/downloads/createIndex4x.php b/production/downloadsites/eclipse/downloads/createIndex4x.php index c20a7a1c1..e2244cc1a 100644 --- a/production/downloadsites/eclipse/downloads/createIndex4x.php +++ b/production/downloadsites/eclipse/downloads/createIndex4x.php @@ -15,13 +15,13 @@ $testConfigs = array(); ob_start(); /* - DL.header.php.html and DL.footer.php.html were original obtained from + DL.header.php.html and DL.footer.php.html were original obtained from wget http://eclipse.org/eclipse.org-common/themes/solstice/html_template/header.php; wget http://eclipse.org/eclipse.org-common/themes/solstice/html_template/footer.php; -and then those files modified to suit our needs. The header required a fair amount of customization, -the footer almost none. +and then those files modified to suit our needs. The header required a fair amount of customization, +the footer almost none. See bug 437494 for a few details. https://bugs.eclipse.org/bugs/show_bug.cgi?id=437494 @@ -36,8 +36,8 @@ require("DL.header.php.html"); page you can find the latest builds produced by the <a href="https://www.eclipse.org/eclipse/">Eclipse Project</a>. To get started, run the program and go through the user and developer -documentation provided in the help system or -see the <a href="http://help.eclipse.org/">web-based help system</a>. +documentation provided in the help system or +see the <a href="http://help.eclipse.org/">web-based help system</a>. If you have problems installing or getting the workbench to run, <a href="https://wiki.eclipse.org/index.php/The_Official_Eclipse_FAQs">check out the Eclipse Project FAQ,</a> or try posting a question to the <a href="https://www.eclipse.org/forums/">forum</a>. </p> @@ -49,7 +49,7 @@ For reference, see also <a href="build_types.html">meaning of kinds of builds</a> (P,M,N,I,S, and R), and the <a href="https://www.eclipse.org/eclipse/platform-releng/buildSchedule.html">build schedule</a>. </p> -<p><img src="new.gif" alt="News Item 1" /> Eclipse support for Java™ 8 is built–in +<p><img src="new.gif" alt="News Item 1" /> Eclipse support for Java™ 8 is built–in to <a href="drops4/R-4.4-201406061215/">Luna (4.4)</a> so it, and all subsequent builds, contain full support for <a href="http://www.oracle.com/technetwork/java/javase/overview/index.html">Java™ 8</a>. For Kepler SR2 (4.3.2), a <a href="https://wiki.eclipse.org/JDT/Eclipse_Java_8_Support_For_Kepler">feature patch</a> with @@ -92,9 +92,9 @@ function calcTestConfigsRan($buildName, $testResultsDirName) { global $expectedtestConfigs; $boxes=0; - // the include file, testConfigs.php defines 'testConfigs' array, - // which consists of strings defining what platforms and vms we test. - // For example, a testConfigs.php file might consist of + // the include file, testConfigs.php defines 'testConfigs' array, + // which consists of strings defining what platforms and vms we test. + // For example, a testConfigs.php file might consist of // <?php // $expectedTestConfigs = array(); // $expectedTestConfigs[]="linux.gtk.x86_64_8.0"; diff --git a/production/getEBuilderForDropDir.sh b/production/getEBuilderForDropDir.sh index efb2c461c..265b99dcf 100755 --- a/production/getEBuilderForDropDir.sh +++ b/production/getEBuilderForDropDir.sh @@ -46,7 +46,7 @@ then # permissions for later "clean up" routines. mkdir -p "${BUILD_DIR}/${EBUILDER}" chmod -c g+ws "${BUILD_DIR}/${EBUILDER}" - # note the use of "reference" ... we typically only need a little bit of + # note the use of "reference" ... we typically only need a little bit of # new stuff, that the gitCache version doesn't have already, if any. git clone --reference $aggDir ${AGGREGATOR_REPO} ${BUILD_DIR}/${EBUILDER} @@ -79,10 +79,10 @@ else popd fi # prepare a (small) zip, for easy retrieval of "production" files, during unit tests on Hudson. -# This basic function used to be provided by CGit, but was turned off for "snapshots" of commits, +# This basic function used to be provided by CGit, but was turned off for "snapshots" of commits, # and was a bit overkill for those doing their own "remote" test builds (or tests). -# This small zip is stored, unadvertised, on download site, and retrieved as part of the -# Hudson test "bootstrap". The "production" directory in general, though, is also +# This small zip is stored, unadvertised, on download site, and retrieved as part of the +# Hudson test "bootstrap". The "production" directory in general, though, is also # used during the build itself. # (hard to know "where" we are at ... so we'll make sure. printf "\n\tDEBUG: %s\n" "About to create EBuilder zip: ${EBUILDER}-${EBUILDER_HASH}.zip" diff --git a/production/sdk/checkForErrorExit.sh b/production/sdk/checkForErrorExit.sh index bf0697919..06cbdfa65 100755 --- a/production/sdk/checkForErrorExit.sh +++ b/production/sdk/checkForErrorExit.sh @@ -1,5 +1,5 @@ -# TODO: an enhanced version was put directly in 'wgetFreshSDKdir.sh' +# TODO: an enhanced version was put directly in 'wgetFreshSDKdir.sh' # Should check if this is used anywhere, and delete, if not. function checkForErrorExit () diff --git a/production/sdk/collect.sh b/production/sdk/collect.sh index 8eaddde45..2cb2ca6ff 100755 --- a/production/sdk/collect.sh +++ b/production/sdk/collect.sh @@ -42,6 +42,7 @@ export ANT_HOME=/shared/common/apache-ant-1.9.2 export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:$PATH read inputline +echo " = = Properties in collect.sh == " echo "inputline: $inputline" job="$(echo $inputline | cut -d\ -f1)" diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml index 348c60ff9..b3326456f 100644 --- a/production/sdk/collectTestResults.xml +++ b/production/sdk/collectTestResults.xml @@ -27,7 +27,7 @@ <globmapper from="archive/workarea/${buildId}/eclipse-testing/results/*" to="*" /> </unzip> - <exec executable="/bin/bash"> + <exec executable="/bin/bash" failonerror="true"> <arg line="/shared/eclipse/sdk/promotion/updateDropLocation.sh ${eclipseStream} ${buildId} ${EBUILDER_HASH} ${job}" /> </exec> @@ -122,15 +122,15 @@ <echo message="postingDirectory: ${postingDirectory}" /> - <!-- - Three possible results directories, per platform/build/job (two related to performance tests, one for regular unit tests). + <!-- + Three possible results directories, per platform/build/job (two related to performance tests, one for regular unit tests). All of these asssume following naming conventions in Hudson jobs. TODO: in future could/should have properties that describe the tests anyway, so might want to use that, to deside results directories.Currently: ends with -baseline: perfBaselineresults contains -perf- : perfresults else: testresults The first two both contain '-perf-' so important to look for '-baseline' first. - The last we assume by default is unit tests, but those jobs should contain '-unit-' if + The last we assume by default is unit tests, but those jobs should contain '-unit-' if we ever wanted tighter checking that names were as expected. --> <condition property="resultsDir" value="${postingDirectory}/${buildId}/perfBaselineresults"> diff --git a/production/sdk/declareTemplate/declare.txt b/production/sdk/declareTemplate/declare.txt index 73f6f5eb3..ab4c861fa 100644 --- a/production/sdk/declareTemplate/declare.txt +++ b/production/sdk/declareTemplate/declare.txt @@ -22,7 +22,7 @@ Deadlines: Thursday, 10/30, around 5 PM (Eastern), deadline for official sign-off (or, comment here in bug when you expect to be able to finish). -Friday, 10/31, afternoon, +Friday, 10/31, afternoon, promote approved build to Mars "S-build" and contribute to simultaneous release repo, and announce to our mailing lists. diff --git a/production/sdk/promoteStableRelease/promoteImpl/createDeferredStepsScript.sh b/production/sdk/promoteStableRelease/promoteImpl/createDeferredStepsScript.sh index 25e2d4307..c79ba588b 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/createDeferredStepsScript.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/createDeferredStepsScript.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# This is DL_DROP_ID for Eclipse. The one for equinox has DL_LABEL_EQ in middle. +# This is DL_DROP_ID for Eclipse. The one for equinox has DL_LABEL_EQ in middle. DL_DROP_ID=${DL_TYPE}-${DL_LABEL}-${BUILD_TIMESTAMP} diff --git a/production/sdk/promoteStableRelease/promoteImpl/promoteDropSite.sh b/production/sdk/promoteStableRelease/promoteImpl/promoteDropSite.sh index 18518f461..7fd97bf8e 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/promoteDropSite.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/promoteDropSite.sh @@ -31,15 +31,15 @@ rsync -ra ${DROP_ID}/ ${DROP_ID}ORIG printf "\n\t%s\n" "Doing rename of original." -# if DL_DROP_ID already exists, it is from a previous run we are re-doing, do, +# if DL_DROP_ID already exists, it is from a previous run we are re-doing, do, # we'll remove first, to make sure it's cleaning re-done. -if [[ -d ${DL_DROP_ID} ]] -then +if [[ -d ${DL_DROP_ID} ]] +then echo -e "\n\tWARNING: found and will remove existing, previous, version of ${DL_DROP_ID}" rm -fr ${DL_DROP_ID} RC=$? - if [[ $RC != 0 ]] - then + if [[ $RC != 0 ]] + then echo -e "/n/tERROR: Could not remove previous (failed) version of DL_DROP_ID, ${DL_DROP_ID}" exit 1 fi @@ -72,7 +72,7 @@ if [[ "${DL_TYPE}" =~ [SR] ]] then # as a matter of routine, turn "test color" to green, if not already touch ${DL_DROP_ID}/overrideTestColor - + # and turn on "news flag" touch ${DL_DROP_ID}/news fi diff --git a/production/sdk/promoteStableRelease/promoteImpl/promoteDropSiteEq.sh b/production/sdk/promoteStableRelease/promoteImpl/promoteDropSiteEq.sh index f20dce7ad..f8ffbb82f 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/promoteDropSiteEq.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/promoteDropSiteEq.sh @@ -31,15 +31,15 @@ rsync -ra ${DROP_ID}/ ${DROP_ID}ORIG printf "\n\t%s\n" "Doing rename of original." -# if DL_DROP_ID already exists, it is from a previous run we are re-doing, do, +# if DL_DROP_ID already exists, it is from a previous run we are re-doing, do, # we'll remove first, to make sure it's cleaning re-done. -if [[ -d ${DL_DROP_ID} ]] -then +if [[ -d ${DL_DROP_ID} ]] +then echo -e "\n\tWARNING: found and will remove existing, previous, version of ${DL_DROP_ID}" rm -fr ${DL_DROP_ID} RC=$? - if [[ $RC != 0 ]] - then + if [[ $RC != 0 ]] + then echo -e "/n/tERROR: Could not remove previous (failed) version of DL_DROP_ID, ${DL_DROP_ID}" exit 1 fi diff --git a/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource b/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource index aac4deb61..7e7220bce 100644 --- a/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource +++ b/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource @@ -33,7 +33,7 @@ function findEclipseExe () echo -e "\n\tWARNING: The basebuilder directory " 2>>${TRACE_LOG} echo -e "\t${baseBuilderDir}" 2>>${TRACE_LOG} echo -e "\tdid not exist as expected. Will re-create.\n" 2>>${TRACE_LOG} - + EBuilder="${BUILD_ROOT}/gitCache/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder" # make sure that build repo still exists if [[ ! -d ${EBuilder} ]] @@ -70,7 +70,7 @@ function findEclipseExe () echo "ERROR: ECLIPSE_EXE is not defined to an executable eclipse" 2>>${TRACE_LOG} # bit of a hack to make executable, when it should be already!? chmod -c +x ${ECLIPSE_EXE} - # may have in include *.so? + # may have in include *.so? fi return 0 diff --git a/production/sdk/promoteStableRelease/promoteLuna/promoteSites.sh b/production/sdk/promoteStableRelease/promoteLuna/promoteSites.sh index 0254e3bb2..d6a3ae665 100755 --- a/production/sdk/promoteStableRelease/promoteLuna/promoteSites.sh +++ b/production/sdk/promoteStableRelease/promoteLuna/promoteSites.sh @@ -18,7 +18,7 @@ export CL_SITE=${PWD} echo "CL_SITE: ${CL_SITE}" # These are what precedes main drop directory name -# For Maintenance, it's always 'M' (from M-build) until it's 'R'. +# For Maintenance, it's always 'M' (from M-build) until it's 'R'. # for main line code, it's 'S' (from I-build) until it's 'R' #export DL_TYPE=S #export DL_TYPE=R diff --git a/production/sdk/promoteStableRelease/promoteMars/promoteSites.sh b/production/sdk/promoteStableRelease/promoteMars/promoteSites.sh index d27ee1a32..a3b0326a5 100755 --- a/production/sdk/promoteStableRelease/promoteMars/promoteSites.sh +++ b/production/sdk/promoteStableRelease/promoteMars/promoteSites.sh @@ -111,7 +111,7 @@ then exit $rccode fi -# create script that automates the second step, doing all deferred actions at once. +# create script that automates the second step, doing all deferred actions at once. # (other than sending final email, and updating b3 aggregation file). ${PROMOTE_IMPL}/createDeferredStepsScript.sh diff --git a/production/sdk/promotion/getEBuilder.sh b/production/sdk/promotion/getEBuilder.sh index 5ef01d90b..8cb98854a 100755 --- a/production/sdk/promotion/getEBuilder.sh +++ b/production/sdk/promotion/getEBuilder.sh @@ -44,12 +44,12 @@ then then rm -fr tempebuilder fi - + if [[ -z "${GIT_HOST}" ]] then GIT_HOST=git.eclipse.org fi - + wget -O ebuilder.zip --no-verbose http://${GIT_HOST}/c/platform/${EBUILDER}.git/snapshot/${EBUILDER}-${EBUILDER_HASH}.zip 2>&1 unzip -q ebuilder.zip -d tempebuilder mkdir -p ${WORKSPACE}/${TARGETNAME} @@ -64,9 +64,6 @@ else echo "INFO: ebuilder directory found to exist. Not re-fetching." echo "INFO: ${WORKSPACE}/${TARGETNAME}" fi -# copy to well-known location so subsequent steps do not need to know which ebuilder they came from -#cp ${WORKSPACE}/${ESCRIPT_LOC}/getBaseBuilder.xml ${WORKSPACE} -#cp ${WORKSPACE}/${ESCRIPT_LOC}/runTests2.xml ${WORKSPACE} # remove on clean exit, if they exist if [[ -f ebuilder.zip ]] diff --git a/production/sdk/promotion/syncDropLocation.sh b/production/sdk/promotion/syncDropLocation.sh index c73dea33c..5b9d445c2 100755 --- a/production/sdk/promotion/syncDropLocation.sh +++ b/production/sdk/promotion/syncDropLocation.sh @@ -56,18 +56,18 @@ function sendPromoteMail () comparatorLogRelPath="buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt" fsDocRoot="/home/data/httpd/download.eclipse.org" - # comparator log is always about 200 or 300 bytes, since it contains some + # comparator log is always about 200 or 300 bytes, since it contains some # identifying information, such as - # = = = = + # = = = = # Comparator differences from current build # /shared/eclipse/builds/4N/siteDir/eclipse/downloads/drops4/N20140705-1700 - # compared to reference repo at + # compared to reference repo at # http://download.eclipse.org/eclipse/updates/4.5-I-builds # = = = = - # So we'll set "500 bytes" as minimum which should both ignore all "minimum's", + # So we'll set "500 bytes" as minimum which should both ignore all "minimum's", # and catch anything of substance. comparatorLogMinimumSize=500 - + mainPath=$( dlToPath "$eclipseStream" "$buildId") echo " mainPath: $mainPath" if [[ "$mainPath" == 1 ]] @@ -87,7 +87,7 @@ function sendPromoteMail () else echo -e "DEBUG: comparatorLog was surprisingly not found at:\n\t${comparatorLogPath}" fi - + if [[ -n "${BUILD_FAILED}" ]] then @@ -129,7 +129,7 @@ function sendPromoteMail () if [[ $logSize -gt ${comparatorLogMinimumSize} ]] then message1="${message1}<p> Check unanticipated comparator messages: <br />\n ${downloadURL}${comparatorLogRelPath}<p>\n" - else + else echo -e "DEBUG: comparator logSize of $logSize was not greater than comparatorLogMinimumSize of ${comparatorLogMinimumSize}" fi @@ -153,7 +153,7 @@ function sendPromoteMail () for file in ${fsDocRoot}/${mainPath}/${buildId}/pom_updates/*.diff do echo "DEBUG: pom update file: $file" - # rare there would be non-existent file, given the logic that got us here, + # rare there would be non-existent file, given the logic that got us here, # but we'll check just to be sure. if [[ -e $file ]] then @@ -207,7 +207,7 @@ function startTests() EBUILDER_HASH=$5 if [[ -z "${EBUILDER_HASH}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function $(basename $0)" + printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argument, for this function $(basename $0)" return 1; fi @@ -237,7 +237,7 @@ function syncRepoSite () eclipseStream=$1 if [[ -z "${eclipseStream}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" >&2 + printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argument, for this function $(basename $0)" >&2 return 1; fi @@ -245,7 +245,7 @@ function syncRepoSite () buildType=$2 if [[ -z "${buildType}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide buildType as second argumnet, for this function $(basename $0)" >&2 + printf "\n\n\t%s\n\n" "ERROR: Must provide buildType as second argument, for this function $(basename $0)" >&2 return 1; fi @@ -325,7 +325,7 @@ echo "Starting $0" eclipseStream=$1 if [[ -z "${eclipseStream}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" + printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argument, for this function $(basename $0)" exit 1 fi echo "eclipseStream: $eclipseStream" @@ -333,7 +333,7 @@ echo "eclipseStream: $eclipseStream" buildId=$2 if [[ -z "${buildId}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" + printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argument, for this function $(basename $0)" exit 1 fi echo "buildId: $buildId" @@ -342,8 +342,8 @@ echo "buildId: $buildId" EBUILDER_HASH=$3 if [[ -z "${EBUILDER_HASH}" ]] then - printf "\n\n\t%s\n\n" "WARNING: Must provide builder (or aggregator) hash as fourth argumnet, for this function, $0" - #printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function, $0" + printf "\n\n\t%s\n\n" "WARNING: Must provide builder (or aggregator) hash as fourth argument, for this function, $0" + #printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argument, for this function, $0" #exit 1; fi echo "EBUILDER_HASH: $EBUILDER_HASH" @@ -392,7 +392,7 @@ ${SCRIPTDIR}/getEBuilder.sh "${EBUILDER_HASH}" "${dropFromBuildDir}" # if build failed, don't promote repo if [[ -z "$BUILD_FAILED" ]] then - syncRepoSite "$eclipseStream" "$buildType" + syncRepoSite "$eclipseStream" "$buildType" rccode=$? if [[ $rccode != 0 ]] then diff --git a/production/sdk/promotion/updateDropLocation.sh b/production/sdk/promotion/updateDropLocation.sh index aca4066e6..20f3f7030 100755 --- a/production/sdk/promotion/updateDropLocation.sh +++ b/production/sdk/promotion/updateDropLocation.sh @@ -10,7 +10,7 @@ function dlpath() eclipseStream=$1 if [[ -z "${eclipseStream}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" + printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argument, for this function $(basename $0)" return 1; fi @@ -18,7 +18,7 @@ function dlpath() buildId=$2 if [[ -z "${buildId}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" + printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argument, for this function $(basename $0)" return 1; fi @@ -43,30 +43,35 @@ function updatePages() EBUILDER_HASH=$3 if [[ -z "${EBUILDER_HASH}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function $(basename $0)" + printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as third argument, for this function $(basename $0)" return 1; fi JOB_NAME=$4 + if [[ -z "${JOB_NAME}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide JOB_NAME as fourth argument, for this function $(basename $0)" + return 1; + fi eclipseStreamMajor=${eclipseStream:0:1} buildType=${buildId:0:1} - + echo "-- properties in updateDropLocation.sh function updatePages --" echo "eclipseStreamMajor: $eclipseStreamMajor" echo "buildType: $buildType" echo "eclipseStream: $eclipseStream" echo "buildId: $buildId" echo "EBUILDER_HASH: $EBUILDER_HASH" - echo "JOB_NAME=$JOB_NAME" + echo "JOB_NAME: $JOB_NAME" # compute directory on build machine dropFromBuildDir=$( dropFromBuildDir "$eclipseStream" "$buildId" ) echo "dropFromBuildDir: $dropFromBuildDir" - eclipsebuilder=eclipse.platform.releng.aggregator - ebuilderDropDir="${dropFromBuildDir}/${eclipsebuilder}/production/testScripts" + eclipsebuilder=eclipse.platform.releng.aggregator + ebuilderDropDir="${dropFromBuildDir}/${eclipsebuilder}/production/testScripts" echo "DEBUG: ebuilderDropDir: ${ebuilderDropDir}" ${ebuilderDropDir}/updateTestResultsPages.sh $eclipseStream $buildId $JOB_NAME @@ -74,7 +79,7 @@ function updatePages() if [[ $rccode != 0 ]] then printf "\n\n\t%s\n\n" "ERROR occurred while updating test pages." - exit 1 + return $rccode fi } @@ -96,11 +101,11 @@ then printf "\t\t%s\t%s\n" "EBUILDER_HASH" "(SHA1 HASH for eclipse builder used) " printf "\t\t%s\t%s\n" "JOB_NAME" "job name from Hudson" printf "\t%s\n" "for example," - printf "\t%s\n\n" "./$scriptname 4.5.1 N20120415-2015 master ep4I-unit-lin64" + printf "\t%s\n\n" "./$scriptname 4.5.1 N20120415-2015 master ep4I-unit-lin64" exit 1 fi -echo "Staring $0" +echo "Starting $0" eclipseStream=$1 if [[ -z "${eclipseStream}" ]] @@ -121,12 +126,18 @@ echo "buildId: $buildId" EBUILDER_HASH=$3 if [[ -z "${EBUILDER_HASH}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function $(basename $0)" + printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as third argument, for this function $(basename $0)" exit 1; fi echo "EBUILDER_HASH: $EBUILDER_HASH" JOB_NAME=$4 +if [[ -z "${JOB_NAME}" ]] +then + printf "\n\n\t%s\n\n" "ERROR: Must provide job (JOB_NAME) as fourth argument, for this function $(basename $0)" + exit 1; +fi +echo "JOB_NAME: $JOB_NAME" eclipseStreamMajor=${eclipseStream:0:1} buildType=${buildId:0:1} diff --git a/production/sdk/testsummaries/genTestIndexes.xml b/production/sdk/testsummaries/genTestIndexes.xml index c4860cb44..908345276 100644 --- a/production/sdk/testsummaries/genTestIndexes.xml +++ b/production/sdk/testsummaries/genTestIndexes.xml @@ -67,9 +67,6 @@ name="platformIdentifierToken" value="%platform%" /> <property - name="platformSpecificTemplateList" - value="Windows,${publishingContent}/templateFiles/platform.php.template,winPlatform.php;Linux,${publishingContent}/templateFiles/platform.php.template,linPlatform.php;Solaris,${publishingContent}/templateFiles/platform.php.template,solPlatform.php;AIX,${publishingContent}/templateFiles/platform.php.template,aixPlatform.php;Macintosh,${publishingContent}/templateFiles/platform.php.template,macPlatform.php;HP-UX,${publishingContent}/templateFiles/platform.php.template,hpuxPlatform.php" /> - <property name="indexFileName" value="index.php" /> <property diff --git a/production/sdk/updateIndexFilesFunction.shsource b/production/sdk/updateIndexFilesFunction.shsource index 1bd096025..928335008 100644 --- a/production/sdk/updateIndexFilesFunction.shsource +++ b/production/sdk/updateIndexFilesFunction.shsource @@ -7,6 +7,7 @@ # with the important exception that doing from a client, such as using wget, resolves # such variables as _SERVER, and similar, which are null if ran from command line. +source localBuildProperties.shsource function internalUpdateIndex () { @@ -36,10 +37,10 @@ function internalUpdateIndex () rccode=$? if [[ $rccode = 0 ]] then - timestamp=$( date +%Y-%m-%d_%H:%M:%S ) + timestamp=$( date +%Y-%m-%d_%H:%M:%S ) TMP_SAVES=tempSAVEindexhtml/$timestamp mkdir -p $TMP_SAVES - rsync /home/data/httpd/download.eclipse.org/eclipse/downloads/${HTML_PAGE} $TMP_SAVES/ + rsync /home/data/httpd/download.eclipse.org/eclipse/downloads/${HTML_PAGE} $TMP_SAVES/ # TODO: add error checking to making backup rsync ${TEMP_INDEX_TXT} /home/data/httpd/download.eclipse.org/eclipse/downloads/${HTML_PAGE} rccode=$? diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux/platformSpecific.properties index d7f296dff..fb4246f7f 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/platformSpecific.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/platformSpecific.properties @@ -1,12 +1,12 @@ -# This properties file contains items that are specific to the platform being tested, +# This properties file contains items that are specific to the platform being tested, # Typically includes items dependent on exact OS, architecture, and location of files. -# (Historically, this info used to be contained in several files, such as 'vm.properties', +# (Historically, this info used to be contained in several files, such as 'vm.properties', # testing.properties, etc.) # This value is computed by scripts, but there may be need or opportunity -# to denote "extra data" if set here? (But, other changes will be -# needed to be fully functional, since indexer, web pages also depend +# to denote "extra data" if set here? (But, other changes will be +# needed to be fully functional, since indexer, web pages also depend # on this value. # testedPlatform=linux.gtk.x86_64_8.0 @@ -22,9 +22,9 @@ testExecutable=bash #name of script to execute testScript=./testAll.sh -# This value gets written to the "preference file", named org.eclipse.core.net.prefs. +# This value gets written to the "preference file", named org.eclipse.core.net.prefs. # We implement as a property string, since eventually we may test multiple proxy settings. -# These listed here are for tests running on build.eclipse.org, to access files outside +# These listed here are for tests running on build.eclipse.org, to access files outside # eclipse.org infrastructure. org.eclipse.core.net.prefs="\ eclipse.preferences.version=1\n\ diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh index 5e1ca1985..db56c8dc8 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh @@ -29,20 +29,20 @@ then fi echo "PWD: $PWD" -# in production tests, should already be set by runTests2.xml, so -# we set to an old version here, to make obvious if not. +# in production tests, should already be set by runTests2.xml, so +# we set to an old version here, to make obvious if not. export jvm=${jvm:-/shared/common/jdk-1.6.x86_64/jre/bin/java} # production machine is x86_64, but some local setups may be 32 bit and will need to provide # this value in localBuildProperties.shsource. ( eclipseArch=${eclipseArch:-x86_64} -# production.properties is used in production tests, +# production.properties is used in production tests, # need to override on local setups to specify appropriate vm (usually same as jvm). # see bug 388269 export propertyFile=${propertyFile:-platformSpecific.properties} -# in product tests, should be set by runTests2.xml, +# in product tests, should be set by runTests2.xml, # so we use "vm value", "x.0" at end, to make obvious if that's not working. export testedPlatform=${testedPlatform:-linux.gtk.x86_64_x.0} diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/platformSpecific.properties index fb20213d4..1b598584d 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/platformSpecific.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/platformSpecific.properties @@ -1,12 +1,12 @@ -# This properties file contains items that are specific to the platform being tested, +# This properties file contains items that are specific to the platform being tested, # Typically includes items dependent on exact OS, architecture, and location of files. -# (Historically, this info used to be contained in several files, such as 'vm.properties', +# (Historically, this info used to be contained in several files, such as 'vm.properties', # testing.properties, etc.) # This value is computed by scripts, but there may be need or opportunity -# to denote "extra data" if set here? (But, other changes will be -# needed to be fully functional, since indexer, web pages also depend +# to denote "extra data" if set here? (But, other changes will be +# needed to be fully functional, since indexer, web pages also depend # on this value. # testedPlatform=linux.gtk.x86_6.0 @@ -22,9 +22,9 @@ testExecutable=bash #name of script to execute testScript=./testAll.sh -# This value gets written to the "preference file", named org.eclipse.core.net.prefs. +# This value gets written to the "preference file", named org.eclipse.core.net.prefs. # We implement as a property string, since eventually we may test multiple proxy settings. -# These listed here are for tests running on build.eclipse.org, to access files outside +# These listed here are for tests running on build.eclipse.org, to access files outside # eclipse.org infrastructure. org.eclipse.core.net.prefs="\ eclipse.preferences.version=1\n\ diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh index b494d9d11..8b3533dd1 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh @@ -29,20 +29,20 @@ then fi echo "PWD: $PWD" -# in production tests, should already be set by runTests2.xml, so -# we set to an old version here, to make obvious if not. +# in production tests, should already be set by runTests2.xml, so +# we set to an old version here, to make obvious if not. export jvm=${jvm:-/shared/common/jdk-1.6.x86_64/jre/bin/java} # production machine is x86_64, but some local setups may be 32 bit and will need to provide # this value in localBuildProperties.shsource. ( eclipseArch=${eclipseArch:-x86_64} -# production.properties is used in production tests, +# production.properties is used in production tests, # need to override on local setups to specify appropriate vm (usually same as jvm). # see bug 388269 export propertyFile=${propertyFile:-platformSpecific.properties} -# in product tests, should be set by runTests2.xml, +# in product tests, should be set by runTests2.xml, # so we use "vm value", "x.0" at end, to make obvious if that's not working. export testedPlatform=${testedPlatform:-linux.gtk.x86_64_x.0} diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/platformSpecific.properties index fb094be23..868aa9484 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/platformSpecific.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/platformSpecific.properties @@ -1,12 +1,12 @@ -# This properties file contains items that are specific to the platform being tested, +# This properties file contains items that are specific to the platform being tested, # Typically includes items dependent on exact OS, architecture, and location of files. -# (Historically, this info used to be contained in several files, such as 'vm.properties', +# (Historically, this info used to be contained in several files, such as 'vm.properties', # testing.properties, etc.) # This value, testedPlatform, is computed by scripts, but there may be need or opportunity -# to denote "extra data" if set here? (But, other changes will be -# needed to be fully functional, since indexer, web pages also depend +# to denote "extra data" if set here? (But, other changes will be +# needed to be fully functional, since indexer, web pages also depend # on this value. # testedPlatform=macosx.cocoa.x86_5.0 @@ -21,9 +21,9 @@ testExecutable=bash #name of script to execute testScript=./testAll.sh -# This value gets written to the "preference file", named org.eclipse.core.net.prefs. +# This value gets written to the "preference file", named org.eclipse.core.net.prefs. # We implement as a property string, since eventually we may test multiple proxy settings. -# These listed here are for tests running on build.eclipse.org, to access files outside +# These listed here are for tests running on build.eclipse.org, to access files outside # eclipse.org infrastructure. org.eclipse.core.net.prefs="\ eclipse.preferences.version=1\n\ diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties index 605b67650..653f4cf59 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties @@ -1,12 +1,12 @@ -# This properties file contains items that are specific to the platform being tested, +# This properties file contains items that are specific to the platform being tested, # Typically includes items dependent on exact OS, architecture, and location of files. -# (Historically, this info used to be contained in several files, such as 'vm.properties', +# (Historically, this info used to be contained in several files, such as 'vm.properties', # testing.properties, etc.) # This value, testedPlatform, is computed by scripts, but there may be need or opportunity -# to denote "extra data" if set here? (But, other changes will be -# needed to be fully functional, since indexer, web pages also depend +# to denote "extra data" if set here? (But, other changes will be +# needed to be fully functional, since indexer, web pages also depend # on this value. # testedPlatform=macosx.cocoa.x86_64_7.0 @@ -28,9 +28,9 @@ testExecutable=bash #name of script to execute testScript=./testAll.sh -# This value gets written to the "preference file", named org.eclipse.core.net.prefs. +# This value gets written to the "preference file", named org.eclipse.core.net.prefs. # We implement as a property string, since eventually we may test multiple proxy settings. -# These listed here are for tests running on build.eclipse.org, to access files outside +# These listed here are for tests running on build.eclipse.org, to access files outside # eclipse.org infrastructure. org.eclipse.core.net.prefs="\ eclipse.preferences.version=1\n\ diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/platformSpecific.properties index 4375a2d0e..fc3d1412c 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/platformSpecific.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/platformSpecific.properties @@ -1,12 +1,12 @@ -# This properties file contains items that are specific to the platform being tested, +# This properties file contains items that are specific to the platform being tested, # Typically includes items dependent on exact OS, architecture, and location of files. -# (Historically, this info used to be contained in several files, such as 'vm.properties', +# (Historically, this info used to be contained in several files, such as 'vm.properties', # testing.properties, etc.) # This value is computed by scripts, but there may be need or opportunity -# to denote "extra data" if set here? (But, other changes will be -# needed to be fully functional, since indexer, web pages also depend +# to denote "extra data" if set here? (But, other changes will be +# needed to be fully functional, since indexer, web pages also depend # on this value. # testedPlatform=win32.win32.x86_64_7.0 @@ -23,9 +23,9 @@ testExecutable=cmd #testScript=${executionDir}\\testAll.bat testScript=testAll.bat -# This value gets written to the "preference file", named org.eclipse.core.net.prefs. +# This value gets written to the "preference file", named org.eclipse.core.net.prefs. # We implement as a property string, since eventually we may test multiple proxy settings. -# These listed here are for tests running on build.eclipse.org, to access files outside +# These listed here are for tests running on build.eclipse.org, to access files outside # eclipse.org infrastructure. org.eclipse.core.net.prefs="\ eclipse.preferences.version=1\n\ diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/win7/platformSpecific.properties index e633030a3..33f1fcf25 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/win7/platformSpecific.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7/platformSpecific.properties @@ -1,12 +1,12 @@ -# This properties file contains items that are specific to the platform being tested, +# This properties file contains items that are specific to the platform being tested, # Typically includes items dependent on exact OS, architecture, and location of files. -# (Historically, this info used to be contained in several files, such as 'vm.properties', +# (Historically, this info used to be contained in several files, such as 'vm.properties', # testing.properties, etc.) # This value is computed by scripts, but there may be need or opportunity -# to denote "extra data" if set here? (But, other changes will be -# needed to be fully functional, since indexer, web pages also depend +# to denote "extra data" if set here? (But, other changes will be +# needed to be fully functional, since indexer, web pages also depend # on this value. # testedPlatform=win32.win32.x86_7.0 @@ -23,9 +23,9 @@ testExecutable=cmd #testScript=${executionDir}\\testAll.bat testScript=testAll.bat -# This value gets written to the "preference file", named org.eclipse.core.net.prefs. +# This value gets written to the "preference file", named org.eclipse.core.net.prefs. # We implement as a property string, since eventually we may test multiple proxy settings. -# These listed here are for tests running on build.eclipse.org, to access files outside +# These listed here are for tests running on build.eclipse.org, to access files outside # eclipse.org infrastructure. org.eclipse.core.net.prefs="\ eclipse.preferences.version=1\n\ diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh index c29e83643..055f165f1 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh +++ b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh @@ -5,8 +5,8 @@ echo "command line as passed into $(basename ${0}): ${*}" echo "command line (quoted) as passed into $(basename ${0}): ${@}" -# set minimal path to allow consistency. -# plus, want to have "home"/bin directory, to allow overrides in 'localTestsProperties' +# set minimal path to allow consistency. +# plus, want to have "home"/bin directory, to allow overrides in 'localTestsProperties' # for non-production builds. export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:~/bin @@ -17,8 +17,8 @@ source localBuildProperties.shsource 2>/dev/null export jvm=${jvm:-/shared/common/jdk-1.6.x86_64/jre/bin/java} echo "jvm: $jvm" -if [ -z "${jvm}" -o ! -e ${jvm} ] -then +if [ -z "${jvm}" -o ! -e ${jvm} ] +then echo "No JVM define, or the defined one was found to not be executable" echo " jvm: $jvm" exit 1 @@ -26,13 +26,13 @@ fi stableEclipseSDK=${stableEclipseSDK:-eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz} stableEclipseInstallLocation=${stableEclipseInstallLocation:-${WORKSPACE}/org.eclipse.releng.basebuilder} -# Note: test.xml will "reinstall" fresh install of what we are testing, -# but we do need an install for initial launcher, and, later, need one for a +# Note: test.xml will "reinstall" fresh install of what we are testing, +# but we do need an install for initial launcher, and, later, need one for a # stable version of p2 director. For both purposes, we -# we should use "old and stable" version, -# which needs to be installed in ${stableEclipseInstallLocation}. -# Note: for production tests, we use ${WORKSPACE}/org.eclipse.releng.basebuilder, -# for historical reasons. The "true" (old) basebuilder does not have an 'eclipse' directory; +# we should use "old and stable" version, +# which needs to be installed in ${stableEclipseInstallLocation}. +# Note: for production tests, we use ${WORKSPACE}/org.eclipse.releng.basebuilder, +# for historical reasons. The "true" (old) basebuilder does not have an 'eclipse' directory; # plugins is directly under org.eclipse.releng.basebuilder. if [ ! -r ${stableEclipseInstallLocation} ] then @@ -132,15 +132,15 @@ fi #env #echo " = = = End list environment variables in effect = = = =" -# TODO: consider moving all this to 'testAll.sh'. (If testAll.sh stays around) +# TODO: consider moving all this to 'testAll.sh'. (If testAll.sh stays around) # make sure there is a window manager running. See bug 379026 # we should not have to, but may be a quirk/bug of hudson setup # assuming metacity attaches to "current" display by default (which should have # already been set by Hudson). We echo its value here just for extra reference/cross-checks. -# This next section on window mangers is needed if and only if "running in background" or -# started on another machine, such as Hudson or Cruisecontrol, where it may be running -# "semi headless", but still needs some window manager running for UI tests. +# This next section on window mangers is needed if and only if "running in background" or +# started on another machine, such as Hudson or Cruisecontrol, where it may be running +# "semi headless", but still needs some window manager running for UI tests. echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm):" wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep) echo "Window Manager processes: $wmpss" @@ -201,5 +201,5 @@ if [[ -n "${extdirproperty}" ]] then $jvm ${ANT_OPTS} "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml ${ANT_OPTS} -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger $tests else - $jvm ${ANT_OPTS} -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml ${ANT_OPTS} -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger $tests + $jvm ${ANT_OPTS} -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml ${ANT_OPTS} -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger $tests fi diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml index 2d13660b9..135e35137 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml +++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml @@ -266,10 +266,10 @@ unless="platformTarget" message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" /> <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" /> - <!-- The "platformArchive" is a minimal, stable vesion of eclipse runtime binary, - that is used only for its "p2Director" application, to install tests into - to target test environment. The intent is to make sure that apart of the tests - works consistently, and does not "break the tests", simply because of some recent + <!-- The "platformArchive" is a minimal, stable vesion of eclipse runtime binary, + that is used only for its "p2Director" application, to install tests into + to target test environment. The intent is to make sure that apart of the tests + works consistently, and does not "break the tests", simply because of some recent but in p2Director. (while unlikely, these days ... since that code is not under active development ... you never know) --> @@ -474,7 +474,7 @@ depends="initWorkspace"> <!-- during production testing, previous steps persists some properties - that we would otherwise not have access too. Such as those set on + that we would otherwise not have access too. Such as those set on Hudson command line. --> <property file="${WORKSPACE}/production.properties" /> @@ -538,10 +538,10 @@ unless="eclipseStream" message="eclipseStream value must be provided by caller, such as '4.3.0'." /> <!-- - Not clear why, but I've seen "eclipseStream" value have a trailing + Not clear why, but I've seen "eclipseStream" value have a trailing ?blank? that gets picked up when read in as string. Seems it might be a couple of ant issues? - Luckily we never use it as a whole string (just major and minor) + Luckily we never use it as a whole string (just major and minor) so we can ignore spaces. --> <condition property="streamOK"> @@ -741,7 +741,7 @@ that will "evaluate" variables as loaded. Otherwise, the <properties form has to move to "top of file" ... outer scope? <property file="${eclipseBuilderDir}/eclipse/buildConfigs/sdk.tests/testConfigs/${testPlatform}/testing.properties" /> - + <property name="testingPropertiesfile" value="${executionDir}/testing.properties" /> @@ -755,7 +755,7 @@ hard coded in vm.properties) --> <!-- <property file="vm.properties" /> --> - <!--now set in initBasicDirectories + <!--now set in initBasicDirectories <property name="testedPlatform" value="${os}.${ws}.${arch}" /> @@ -770,10 +770,10 @@ <arg line="-R nouchg ${install}" /> </exec> - <!-- - Originally needed/provided for p2 tests, but they appear not to - be successful in reading or using these proerties any longer. - Not clear why. So we'll leave it in until understood. (It may be + <!-- + Originally needed/provided for p2 tests, but they appear not to + be successful in reading or using these proerties any longer. + Not clear why. So we'll leave it in until understood. (It may be useful in other scenarios, such when tested stand alone?) --> <property @@ -793,7 +793,7 @@ name="org.eclipse.equinox.p2.tests.last.release.build.repo" value="${last.release.build.repo}" /> - <!-- + <!-- It is likely we do not need the equinoxp2propertiesFile any longer, during production tests, at least. --> @@ -833,8 +833,8 @@ append="true" /> </target> - <!-- runtimeArchive is set to either current, just built SDK, or - if "baselinePerf" has been set to true, then that baselinePerf version is used, + <!-- runtimeArchive is set to either current, just built SDK, or + if "baselinePerf" has been set to true, then that baselinePerf version is used, such as for performance baselinePerf run. baselinePerf is set in Hudson job. --> @@ -1202,9 +1202,9 @@ name="getcvstestProperties" if="cvsPropertiesAvailable" depends="checkCVSPropExists"> - <!-- - TODO: cvstest.properties (file location) is currently - hard coded in 'runTest2.xml' adn passed along this 'test.xml' + <!-- + TODO: cvstest.properties (file location) is currently + hard coded in 'runTest2.xml' adn passed along this 'test.xml' via production.properties. Would be better to have the file location be part of the platform specific properties files, as we do with "jvm" --> @@ -1355,46 +1355,46 @@ <target - name="runSuitePerf" + name="runSuitePerf" depends="initStreamVariables" if="pluginexists"> <echo message="testPluginX ${testPluginX}" /> <property name="junit-stylesheet" value="{executionDir}/JUNIT.XSL" /> - <!-- + <!-- TODO: seems these "performance values" should "get into" library.xml in an easier way, that didn't require a change in library.xml. TODO: some question on how "fine" to make name. Such as, should "platform, architecture, window system" be "separated" from "VM value"? TODO: for local, non-production tests, eclipse.perf.dbloc is not being assigned value from "localTestsProperties.shsource" as it should. Perhaps needs tweak in Hudson job? - TODO: would have to compute these in runTest2.xml, to make part of production properties, + TODO: would have to compute these in runTest2.xml, to make part of production properties, and phpproperties.php --> <property name="eclipse.perf.dbloc" value="${eclipse.perf.dbloc.value}"/> <!-- buildIdToUse equals either baselinePerfVersion or else equalus buildId. In either case we want to collect the data --> <!-- TODO: Do we need "buildID" coded somewhere, to know WHICH build to match with? Or, else will take large number of "baselines" averaged? --> - <condition property="eclipse.perf.config" - value="build=${baselinePerfAltVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion};buildId=${buildId}"> + <condition property="eclipse.perf.config" + value="build=${baselinePerfAltVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}"> <istrue value="${baselinePerfAlt}"/> </condition> <condition property="eclipse.perf.config" - value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion};buildId=${buildId}" - else="build=${buildId};config=${testedPlatformConfig};jvm=${javaMajorVersion};buildId=${buildId}"> + value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}" + else="build=${buildId};config=${testedPlatformConfig};jvm=${javaMajorVersion}"> <istrue value="${baselinePerf}"/> </condition> - <!-- - This "assert" property works, in this context, because we run baseline first, + <!-- + This "assert" property works, in this context, because we run baseline first, when buildIdToUse != buildId that is a "baseline run" (so, no "assert" for that baseline run). - But, when buildIdToUse == buildId that is a "normal run" so then we do want to "assert" against the already-collected baseline data. + But, when buildIdToUse == buildId that is a "normal run" so then we do want to "assert" against the already-collected baseline data. Note: Note, docs say order does not matter, and could specify "just build" and reset filled in with what's in 'config', but some experiences makes me doubt that? TODO: design problem: how to distinguish assert against baseline vs. baseline alt. --> - <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion};buildId=${buildId};"> + <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion};"> <equals arg1="${buildIdToUse}" arg2="${buildId}" /> </condition> <!-- frameworkperfargs is used by library.xml ... probably an easier way? --> - <condition property="frameworkperfargs" - value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}" + <condition property="frameworkperfargs" + value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}" else="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config}"> <isset property="eclipse.perf.assertAgainst"/> </condition> @@ -1929,13 +1929,13 @@ </target> <!-- This and all the performance specific targets - are temporary, just to help investigate which work, which + are temporary, just to help investigate which work, which don't, etc. --> <target name="allPerformance" depends="init"> <!-- There are 41 test suites to claim they have - performanc targts. These "sub groups" are just + performanc targts. These "sub groups" are just and attempt to help investigate which work, which don't, etc. --> <antcall target="selectPerformance" /> <antcall target="otherPerformance" /> @@ -1943,9 +1943,9 @@ </target> <!-- This and all the performance specific targets - are temporary, just to help investigate which work, which - don't, etc. Visually inspected each, and found these 21 do - have performance targets, which means there's about 20 that + are temporary, just to help investigate which work, which + don't, etc. Visually inspected each, and found these 21 do + have performance targets, which means there's about 20 that have empty peformance targets. --> <target @@ -1955,18 +1955,22 @@ <antcall target="compare" /> <antcall target="coreresources" /> <antcall target="coreruntime" /> + <!-- temp remove, just for quicker testing <antcall target="jdtdebug" /> <antcall target="jdtui" /> + --> <!--https://bugs.eclipse.org/bugs/show_bug.cgi?id=443233 <antcall target="osgi" /> --> <antcall target="pdeui" /> <antcall target="swt" /> + <!-- temp remove, just for quicker testing <antcall target="teamcvs" /> <antcall target="ua" /> <antcall target="uiforms" /> <antcall target="uiperformance" /> <antcall target="uircp" /> + --> </target> <target diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index be2886254..ef5d46b1e 100644 --- a/production/testScripts/configuration/streamSpecific.properties +++ b/production/testScripts/configuration/streamSpecific.properties @@ -7,18 +7,18 @@ # is being retrived and used. streamSpecificPropertiesTitle="Properties for 4.5.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 -# director, etc., so that "running the tests" is not actually using -# the "just built" versions. +# These "previousRelease" variables are primarily used to have a +# stable version of Eclipse, that is used, for example, for it's p2 +# director, etc., so that "running the tests" is not actually using +# the "just built" versions. previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.4.1-201409250400 -# version here is "build label" ... in general form, the "middle" of archive name, +# version here is "build label" ... in general form, the "middle" of archive name, # such as "eclipse-platform-${previousReleaseVersion}-linux-gtk-x86_64.tar.gz # Also used used in p2 testing? previousReleaseVersion=4.4.1 -# This is last segment of last release repo, such as in +# This is last segment of last release repo, such as in # http://${DOWNLOAD_HOST}/eclipse/updates/${previousReleaseVersion} -# NOTE: I am assuming the "composite" repo is suitable for p2. In theory, +# NOTE: I am assuming the "composite" repo is suitable for p2. In theory, # they might want the simple repo, such as at 4.4/R-4.4.1-201409250400 previousReleaseVersionRepo=4.4 @@ -30,10 +30,10 @@ apiTestsPreviousBaseWin32Filename=eclipse-SDK-4.4.1-win32.zip apiTestsPreviousRefererenceBaseDLBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.3.2-201402211700 apiTestsPreviousRefererenceWin32Filename=eclipse-SDK-4.3.2-win32.zip -# the following are not used in unit tests, only performance tests, when the variables -# baselinePerf=true, -# or baselinePerfAlt=true -# are specified. The baselinePerf will often be the same as "previous release", but +# the following are not used in unit tests, only performance tests, when the variables +# baselinePerf=true, +# or baselinePerfAlt=true +# are specified. The baselinePerf will often be the same as "previous release", but # not necessarily, so is not hard coded in assumptions. baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.4-201406061215 baselinePerfVersion=R-4.4-201406061215 diff --git a/production/testScripts/genTestIndexes.xml b/production/testScripts/genTestIndexes.xml index 0d67eb576..a402d1fd5 100644 --- a/production/testScripts/genTestIndexes.xml +++ b/production/testScripts/genTestIndexes.xml @@ -22,8 +22,39 @@ project.setProperty("buildType", sArray[1]); ]]> </script> + <condition + property="dropsDirSegment" + value="drops4" + else="drops"> + <equals + arg1="${eclipseStreamMajor}" + arg2="4" /> + </condition> + <!-- publish.xml expects buildLabel in places, instead of buildId, + though we use them interchangebly --> + <property + name="buildLabel" + value="${buildId}" /> + <property + name="dropsDirXSegment" + value="${dropsDirSegment}" /> + + <property + name="buildRoot" + value="${buildHome}/${eclipseStreamMajor}${buildType}" /> - <!-- Note: results template is selected based on + <property + name="postingDirectory" + value="${buildRoot}/siteDir/eclipse/downloads/${dropsDirXSegment}" /> + <condition + property="resultLocation" + value="${postingDirectory}/${buildLabel}/performance" + else="${postingDirectory}/${buildLabel}"> + <contains + string="${job}" + substring="-perf-" /> + </condition> + <!-- Note: results template is selected based on conventions used in hudson jobs names. Should move to properties saved in during test run? --> @@ -68,35 +99,13 @@ string="${job}" substring="-perf-" /> </and> - </condition> + </condition> + <echo message="= = Properties in genTestIndexes.xml = = " /> <echo message="job: ${job}" /> <echo message="testTemplate: ${testTemplate}" /> - <!-- - TODO: make less exactly hard coded in future - also, check for validity using "matches" digit*\.digit*\.digit* - --> - <condition - property="dropsDirSegment" - value="drops4" - else="drops"> - <equals - arg1="${eclipseStreamMajor}" - arg2="4" /> - </condition> - - <property - name="dropsDirXSegment" - value="${dropsDirSegment}" /> - <property - name="buildRoot" - value="${buildHome}/${eclipseStreamMajor}${buildType}" /> - - <property - name="postingDirectory" - value="${buildRoot}/siteDir/eclipse/downloads/${dropsDirXSegment}" /> <property name="EBuilderDir" @@ -115,11 +124,7 @@ name="base.builder" value="${postingDirectory}/${buildId}/org.eclipse.releng.basebuilder" /> - <!-- publish.xml expects buildLabel in places, instead of buildId, - though we use them interchangebly --> - <property - name="buildLabel" - value="${buildId}" /> + <!-- Not sure this is the "working directory" expected. May impact ability to get/find "buildNotes"? Need to copy such "source" things at build time. --> @@ -170,11 +175,6 @@ <property name="platformIdentifierToken" value="%platform%" /> -<!-- Remember, even though we no longer use these, if removed here, results - in "index out of bounds" error in the custom ant task --> - <property - name="platformSpecificTemplateList" - value="Windows,${publishingContent}/templateFiles/platform.php.template,winPlatform.php;Linux,${publishingContent}/templateFiles/platform.php.template,linPlatform.php;Solaris,${publishingContent}/templateFiles/platform.php.template,solPlatform.php;AIX,${publishingContent}/templateFiles/platform.php.template,aixPlatform.php;Macintosh,${publishingContent}/templateFiles/platform.php.template,macPlatform.php;HP-UX,${publishingContent}/templateFiles/platform.php.template,hpuxPlatform.php" /> <property name="indexFileName" @@ -219,18 +219,12 @@ <property name="platformIdentifierToken" value="%platform%" /> - <!-- Remember, even though we no longer use these, if removed here, results - in "index out of bounds" error in the custom ant task, indexResults. --> - <property - name="platformSpecificTemplateList" - value="Windows,${publishingContent}/templateFiles/platform.php.template,winPlatform.php;Linux,${publishingContent}/templateFiles/platform.php.template,linPlatform.php;Solaris,${publishingContent}/templateFiles/platform.php.template,solPlatform.php;AIX,${publishingContent}/templateFiles/platform.php.template,aixPlatform.php;Macintosh,${publishingContent}/templateFiles/platform.php.template,macPlatform.php;HP-UX,${publishingContent}/templateFiles/platform.php.template,hpuxPlatform.php" /> - <property name="indexFileName" value="index.php" /> <property name="result" - value="${postingDirectory}/${buildLabel}" /> + value="${resultLocation}" /> <property name="testResultsTemplateFileName" value="${publishingContent}/templateFiles/${testTemplate}" /> diff --git a/production/testScripts/getBaseBuilder.xml b/production/testScripts/getBaseBuilder.xml index 9393db1bf..3e7eb60fb 100644 --- a/production/testScripts/getBaseBuilder.xml +++ b/production/testScripts/getBaseBuilder.xml @@ -17,7 +17,7 @@ <property environment="env" /> <!-- - TODO: eventually should be previousReleaseVersion + TODO: eventually should be previousReleaseVersion which requires "initStreamVariables" --> <property diff --git a/production/testScripts/hudsonBootstrap/getEBuilder.xml b/production/testScripts/hudsonBootstrap/getEBuilder.xml index 7cddf4aca..745e8f7ab 100644 --- a/production/testScripts/hudsonBootstrap/getEBuilder.xml +++ b/production/testScripts/hudsonBootstrap/getEBuilder.xml @@ -37,7 +37,7 @@ else="git.eclipse.org"> <isset property="env.GIT_HOST" /> </condition> - + <!-- normally provided by caller, but if not, assume master --> <property name="EBUILDER_HASH" @@ -98,16 +98,16 @@ <antcall target="fetchEBuilder" /> <antcall target="EBuildercleanup" /> - <!-- - Copy the file(s) we need for subsequent steps to "well known" - location. + <!-- + Copy the file(s) we need for subsequent steps to "well known" + location. <copy file="${WORKSPACE}/${eScriptLocation}/runTests2.xml" todir="${WORKSPACE}" /> --> - <!-- remember, 'getBaseBuilder' has it's own properties, which - must be set by now, if desired to make use of them, + <!-- remember, 'getBaseBuilder' has it's own properties, which + must be set by now, if desired to make use of them, such as a common one for local testing would be: basebuilderlocal=/shared/baseBuilderCache --> @@ -135,16 +135,16 @@ <!-- We need only the 'production/testscripts' directory. And input can be of different "depths" depending on where it comes from. --> <move verbose="true" todir="${WORKSPACE}/${folderName}"> <fileset dir="${WORKSPACE}/tempEBuilder" /> - <mapper + <mapper type="regexp" from=".*production([/\\])testScripts(.*)" to="production\1testScripts\2" /> </move> -<!-- might be better (easier) to use a "copy", rather than a move, - with that regexp mapper. Such as below. But, I'm not clear on - directory structure if "branch" not used. - <copy todir="${WORKSPACE}/${folderName}" > - <fileset dir="${${WORKSPACE}/tempEBuilder/${folderName}-${EBUILDER_HASH}"> +<!-- might be better (easier) to use a "copy", rather than a move, + with that regexp mapper. Such as below. But, I'm not clear on + directory structure if "branch" not used. + <copy todir="${WORKSPACE}/${folderName}" > + <fileset dir="${${WORKSPACE}/tempEBuilder/${folderName}-${EBUILDER_HASH}"> <include name="production/testScripts/**"/> </fileset> </copy> @@ -220,7 +220,7 @@ if="downloadURL" unless="EBuilderfetched"> <echo message="Fetching pre-made EBuilder subset from download site." /> - <get + <get src="${downloadURL}/${scmProject}-${EBUILDER_HASH}.zip" dest="${WORKSPACE}" /> <echo message="Fetched EBuilder from ${downloadURL}" /> diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml index f6963e630..0078c08b6 100644 --- a/production/testScripts/runTests2.xml +++ b/production/testScripts/runTests2.xml @@ -15,10 +15,10 @@ <property name="selectiveVerbose" value="false" /> - <!-- - If not explicitly passed in from caller, assume 'all'. - This is the default target already, in global test.xml, - but this allows us to be explicit (and, make sure it + <!-- + If not explicitly passed in from caller, assume 'all'. + This is the default target already, in global test.xml, + but this allows us to be explicit (and, make sure it continues working). --> <condition property="testSuite" value="${env.testSuite}" else="all"> @@ -27,7 +27,7 @@ <property name="buildURL" value="http://${DOWNLOAD_HOST}/eclipse/downloads/${dropsDirSegment}/${buildId}" /> - + <!-- we'll check "alt" baselinePerf first. This is what's used for "several releases ago", or similar. --> <condition property="buildIdToUse" @@ -55,28 +55,28 @@ <property name="eclipse.perf.dbloc" value="${eclipse.perf.dbloc.value}"/> <!-- TODO: Do we need "buildID" coded somewhere, to know WHICH build to match with? Or, else will take large number of "baselines" averaged? --> - <condition property="eclipse.perf.config" - value="build=${baselinePerfAltVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion};buildId=${buildId}"> + <condition property="eclipse.perf.config" + value="build=${baselinePerfAltVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}"> <istrue value="${baselinePerfAlt}"/> </condition> <condition property="eclipse.perf.config" - value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion};buildId=${buildId}" - else="build=${buildId};config=${testedPlatformConfig};jvm=${javaMajorVersion};buildId=${buildId}"> + value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}" + else="build=${buildId};config=${testedPlatformConfig};jvm=${javaMajorVersion}"> <istrue value="${baselinePerf}"/> </condition> - <!-- - This "assert" property works, in this context, because we run baseline first, + <!-- + This "assert" property works, in this context, because we run baseline first, when buildIdToUse != buildId that is a "baseline run" (so, no "assert" for that baseline run). - But, when buildIdToUse == buildId that is a "normal run" so then we do want to "assert" against the already-collected baseline data. + But, when buildIdToUse == buildId that is a "normal run" so then we do want to "assert" against the already-collected baseline data. Note: Note, docs say order does not matter, and could specify "just build" and reset filled in with what's in 'config', but some experiences makes me doubt that? TODO: design problem: how to distinguish assert against baseline vs. baseline alt. --> - <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion};buildId=${buildId};"> + <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion};"> <equals arg1="${buildIdToUse}" arg2="${buildId}" /> </condition> <!-- frameworkperfargs is used by library.xml ... probably an easier way? --> - <condition property="frameworkperfargs" - value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}" + <condition property="frameworkperfargs" + value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}" else="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config}"> <isset property="eclipse.perf.assertAgainst"/> </condition> @@ -383,13 +383,13 @@ <echo message="testPlatform ${testPlatform}" /> </target> - <!-- - Note that in getting the target platform, we nearly always get the 'buildId' version, - the one we just built. But, in somecases, we use "baselinePerf" version for performance + <!-- + Note that in getting the target platform, we nearly always get the 'buildId' version, + the one we just built. But, in somecases, we use "baselinePerf" version for performance regression testing. In that case, we still get the "buildId" version of tests ... the ones - we just built ... only what we run them on changes. - When we do use 'baselinePerf', that is specified as 'true' in Hudson job, which signals - to use the baselinePerf version defined in 'streamSpecific.properties. + we just built ... only what we run them on changes. + When we do use 'baselinePerf', that is specified as 'true' in Hudson job, which signals + to use the baselinePerf version defined in 'streamSpecific.properties. --> <target name="downloadTargetPlatform" depends="init"> <!-- TODO: should add checks for checksum integrity on downloads. Perhaps use mirror URLs? (though, that'd not effect production) --> @@ -494,7 +494,7 @@ value="${executionDir}/eclipse-junit-tests-${buildId}.zip" /> <echo message="repoZip: ${repoZip}" /> <antcall target="unzipTestFramework" /> - + <!-- We print these properties to a file primarily to capture variables that might have been set in Hudson, which do not "survive" going through the @@ -547,7 +547,7 @@ depends="init"> <!-- here we want to print properties, such as passed in via Hudson, - that can be used later, by test.xml, but since it is started by as seperate + that can be used later, by test.xml, but since it is started by as separate processes, there is no direct access to Hudson properties ... so we make them persistent. In many cases, the property will not be defined, in which case we do not want to write anythng for that property (or, it @@ -582,7 +582,7 @@ <printProperty property="eclipse.perf.dbloc" /> <printProperty property="eclipse.perf.config" /> <printProperty property="eclipse.perf.assertAgainst" /> - + <!-- The following will leave pw in file, which is not a lot different that leave them printed in log, as we also do. But, could be improved by just leaving @@ -1099,11 +1099,11 @@ <printPHPProperty phpvar="ECLIPSE_PERF_DBLOC" value="eclipse.perf.dbloc" /> - - <printPHPProperty + + <printPHPProperty phpvar="ECLIPSE_PERF_CONFIG" value="eclipse.perf.config" /> - <printPHPProperty + <printPHPProperty phpvar="ECLIPSE_PERF_ASSERTAGAINST" value="eclipse.perf.assertAgainst" /> diff --git a/production/testScripts/startTests.sh b/production/testScripts/startTests.sh index 1d1c96159..201a90ec2 100755 --- a/production/testScripts/startTests.sh +++ b/production/testScripts/startTests.sh @@ -28,7 +28,7 @@ function dlpath() eclipseStream=$1 if [[ -z "${eclipseStream}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" + printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argument, for this function $(basename $0)" return 1; fi @@ -36,7 +36,7 @@ function dlpath() buildId=$2 if [[ -z "${buildId}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" + printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argument, for this function $(basename $0)" return 1; fi diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh index 1363f71a0..aed9189ad 100755 --- a/production/testScripts/test_runTests2.xml.sh +++ b/production/testScripts/test_runTests2.xml.sh @@ -3,7 +3,7 @@ # Utility to test the runTests2.xml file. It's intended to allow rapid confirmation # that the runTests2.xml file computes correct values, for various versions platforms -# and various versions of java and ant, etc. +# and various versions of java and ant, etc. # In particular, ant can be invoked with one version of java, but another version # of java used to actually run the tests. @@ -50,10 +50,10 @@ export JAVA_HOME=/shared/common/jdk1.7.0-latest export WORKSPACE=${HOME}/tempworkarea/ export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# This variable signals parts of the script that we are testing the test scripts, +# This variable signals parts of the script that we are testing the test scripts, # and should not actually start the tests. export TESTING_TEST_XML=true -export ANT_OPTS=-Xms1024m -Xmx1024m -Djava.io.tmpdir=${WORKSPACE}/tmp +export ANT_OPTS=-Xms1024m -Xmx1024m -Djava.io.tmpdir=${WORKSPACE}/tmp if [[ "$1" == "-c" ]] then @@ -77,7 +77,7 @@ java -XshowSettings -version wget -O getEBuilder.xml --no-verbose http://${GIT_HOST}/c/platform/eclipse.platform.releng.aggregator.git/plain/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1 # Can only test the "downloadURL form" if there is a current, accurate build. During development, should use git/master version. - + ANTFILE=getEBuilder.xml buildId=N20140823-1500 diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh index fe631bef0..328f3a8da 100755 --- a/production/testScripts/updateTestResultsPages.sh +++ b/production/testScripts/updateTestResultsPages.sh @@ -4,22 +4,23 @@ # re-sync dl site. -if (( $# < 2 )) +if (( $# < 3 )) then # usage: scriptname=$(basename $0) printf "\n\t%s\n" "This script, $scriptname requires three arguments, in order: " printf "\t\t%s\t%s\n" "eclipseStream" "(e.g. 4.2.0 or 3.8.0) " printf "\t\t%s\t%s\n" "buildId" "(e.g. N20120415-2015) " + printf "\t\t%s\t%s\n" "jobName" "(e.g. ep4I-unit-lin64) " printf "\t%s\n" "for example," - printf "\t%s\n\n" "./$scriptname 4.2.0 N20120415-2015 CBI" + printf "\t%s\n\n" "./$scriptname 4.2.0 N20120415-2015 ep4I-unit-lin64" exit 1 fi eclipseStream=$1 if [ -z "${eclipseStream}" ] then - echo "must provide eclipseStream as first argumnet, for this function $0" + echo "must provide eclipseStream as first argument, for this function $0" exit 1 fi @@ -27,11 +28,16 @@ fi buildId=$2 if [ -z "${buildId}" ] then - echo "must provide buildId as second argumnet, for this function $0" + echo "must provide buildId as second argument, for this function $0" exit 1 fi JOB_NAME=$3 +if [ -z "${JOB_NAME}" ] +then + echo "must provide JOB_NAME as third argument, for this function $0" + exit 1 +fi eclipseStreamMajor=${eclipseStream:0:1} buildType=${buildId:0:1} @@ -42,7 +48,7 @@ then pathToDL=eclipse/downloads/drops$eclipseStreamMajor fi - buildRoot=${BUILD_HOME}/${eclipseStreamMajor}${buildType} +buildRoot=${BUILD_HOME}/${eclipseStreamMajor}${buildType} siteDir=${buildRoot}/siteDir @@ -71,7 +77,7 @@ else echo $( $devJRE -version ) fi -# We use a seperate basebuilder for each "drop", to make sure it is specific for that drop, +# We use a separate basebuilder for each "drop", to make sure it is specific for that drop, # and they won't interfere with each other. basebuilderDir=${fromDir}/org.eclipse.releng.basebuilder aggregatorDir=${fromDir}/eclipse.platform.releng.aggregator @@ -88,39 +94,123 @@ ECLIPSE_EXE="${basebuilderDir}/eclipse" # somehow, seems like this is often not executable ... I guess launcher jar usually used. chmod -c +x $ECLIPSE_EXE +export SWT_GTK3=2 + if [ ! -n ${ECLIPSE_EXE} -a -x ${ECLIPSE_EXE} ] then echo "ERROR: ECLIPSE_EXE is not defined or not executable: ${ECLIPSE_EXE}" exit 1 fi -BUILDFILE=${aggregatorDir}/production/testScripts/genTestIndexes.xml - -BUILDFILESTR="-f ${BUILDFILE}" -echo -echo " BUILDFILESTR: $BUILDFILESTR" - -# provide blank, to get default -BUILDTARGET=" " - -devworkspace="${fromDir}/workspace-updateTestResults" -devArgs="-Xmx256m -Dhudson=true -DbuildHome=${BUILD_HOME} -DeclipseStream=${eclipseStream} -DeclipseStreamMajor=${eclipseStreamMajor} -DbuildId=${buildId} -Djob=$JOB_NAME" - -echo -echo " dev script: $0" -echo " devworkspace: $devworkspace" -echo " devArgs: $devArgs" -echo " devJRE: $devJRE" -echo " BUILDFILESTR: $BUILDFILESTR" -echo - -if [ -n ${ECLIPSE_EXE} -a -x ${ECLIPSE_EXE} ] +#if [[ $JOB_NAME =~ ^.*-unit-.*$ ]] +#then + + BUILDFILE=${aggregatorDir}/production/testScripts/genTestIndexes.xml + + BUILDFILESTR="-f ${BUILDFILE}" + echo + echo " BUILDFILESTR: $BUILDFILESTR" + + # provide blank, to get default + BUILDTARGET=" " + + devworkspace="${fromDir}/workspace-updateTestResults" + devArgs="-Xmx256m -Dhudson=true -DbuildHome=${BUILD_HOME} -DeclipseStream=${eclipseStream} -DeclipseStreamMajor=${eclipseStreamMajor} -DbuildId=${buildId} -Djob=$JOB_NAME" + + echo + echo " = = Properties in updateTestResultsPages.sh: -unit- section = = " + echo " dev script: $0" + echo " BUILD_HOME: ${BUILD_HOME}" + echo " devworkspace: $devworkspace" + echo " devArgs: $devArgs" + echo " devJRE: $devJRE" + echo " BUILDFILESTR: $BUILDFILESTR" + echo " job: $JOB_NAME" + echo + + if [ -n ${ECLIPSE_EXE} -a -x ${ECLIPSE_EXE} ] + then + + ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -data $devworkspace -application org.eclipse.ant.core.antRunner $BUILDFILESTR $BUILDTARGET -vm $devJRE -vmargs $devArgs + RC=$? + if [[ $RC != 0 ]] + then + echo "ERROR: eclipse returned non-zero return code, exiting with RC: $RC." + exit $RC + fi + else + echo "ERROR: ECLIPSE_EXE is not defined to executable eclipse." + RC=1 + exit $RC + fi + +#fi + +perfJobPattern="^.*-perf-.*$" +perfBaselineJobPattern="^.*-perf-baseline.*$" +if [[ $JOB_NAME =~ $perfJobPattern ]] then - - ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -console -data $devworkspace -application org.eclipse.ant.core.antRunner $BUILDFILESTR $BUILDTARGET -vm $devJRE -vmargs $devArgs + devworkspace="${fromDir}/workspace-installDerbyCore" + devArgs="-Xmx256m" + + echo "Collected a performance run result. Doing performance analysis" + echo + echo " = = Properties in updateTestResultsPages.sh: -perf- section = = " + echo " dev script: $0" + echo " buildRoot: $buildRoot" + echo " BUILD_HOME: ${BUILD_HOME}" + echo " pathToDL: $pathToDL" + echo " siteDir: $siteDir" + echo " fromDir: $fromDir" + echo " devworkspace: $devworkspace" + echo " devArgs: $devArgs" + echo " devJRE: $devJRE" + echo " BUILDFILESTR: $BUILDFILESTR" + echo " job: $JOB_NAME" + echo + echo " = = First, installing derby" + # make sure derby.core is installed in basebuilder + perfrepoLocation=http://build.eclipse.org/eclipse/buildtools + derby=org.apache.derby.core.feature.feature.group + echo " perfrepoLocation: $perfrepoLocation" + echo " derby: $derby" + + ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.equinox.p2.director -repository ${perfrepoLocation} -installIUs ${derby} -vm $devJRE -vmargs $devArgs + RC=$? + if [[ $RC != 0 ]] + then + echo "ERROR: eclipse returned non-zero return code while installing derby, exiting with RC: $RC." + exit $RC + fi + + echo " = = Now run performance.ui app" + devworkspace="${fromDir}/workspace-updatePerfResults" + vmargs="-Xmx256m -Declipse.perf.dbloc=//192.168.1.10:1527" + postingDirectory=$fromDir + perfOutput=$postingDirectory/performance + # assuming for now the intent is that 'data' is meant to accumulate in common location + dataDir=/shared/eclipse/perfdataDir + mkdir -p $dataDir + # The performance UI function needs a DISPLAY to function, so we'll give it one via xvfb + XVFB_RUN="/usr/bin/xvfb-run" + XVFB_RUN_ARGS="--error-file /shared/eclipse/sdk/testjobdata/xvfb-log.txt" + # --server-args -screen 0 1024x768x24" + # + ${XVFB_RUN} ${XVFB_RUN_ARGS} ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.test.performance.ui.resultGenerator -baseline R-4.4-201406061215 -current ${buildId} -jvm 8.0 -config linux.gtk.x86_64 -output $perfOutput -dataDir ${dataDir} -print -vm ${devJRE} -vmargs ${vmargs} RC=$? + if [[ $RC != 0 ]] + then + echo "ERROR: eclipse returned non-zero return code while using xvfb to invoke performance.ui app, exiting with RC: $RC." + exit $RC + fi + # if not the baseline pattern, run the "generate index" script + if [[ ! $JOB_NAME =~ $perfBaselineJobPattern ]] + then + echo "temporarily "hard copy" performance.php.template as a sanity check to ${fromDir}/performance/performance.php." + # should eventually go trough "index"? + cp -v ${aggregatorDir}/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template ${fromDir}/performance/performance.php + fi else - echo "ERROR: ECLIPSE_EXE is not defined to executable eclipse" - RC=1 + echo "Not a performance run result, exiting without performance analysis." + exit 0 fi -exit $RC |