Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2014-08-03 19:32:28 -0400
committerDavid Williams2014-08-03 19:32:28 -0400
commit1665de14a42fe88c623839b7eb8f1c9a8429c746 (patch)
treeadf9b209605e2ff32693cd7400dbdcfe4be9ec4d
parentd451396ba9a46d98ac1970f6a42ea5192ed3a7bb (diff)
downloadeclipse.platform.releng.aggregator-1665de14a42fe88c623839b7eb8f1c9a8429c746.tar.gz
eclipse.platform.releng.aggregator-1665de14a42fe88c623839b7eb8f1c9a8429c746.tar.xz
eclipse.platform.releng.aggregator-1665de14a42fe88c623839b7eb8f1c9a8429c746.zip
Bug 387066 - Remove Red X's (and the few green checkmarks) from main DL
page - prep to fixing links.
-rwxr-xr-xproduction/sdk/collect.sh3
-rw-r--r--production/sdk/collectTestResults.xml56
2 files changed, 44 insertions, 15 deletions
diff --git a/production/sdk/collect.sh b/production/sdk/collect.sh
index 35f203d6..9eac27f2 100755
--- a/production/sdk/collect.sh
+++ b/production/sdk/collect.sh
@@ -63,4 +63,5 @@ ${ANT_HOME}/bin/ant -version
-DbuildNumber=${buildNumber} \
-DbuildId=${buildId} \
-DeclipseStream=${eclipseStream} \
- -DEBUILDER_HASH=${EBUILDER_HASH}
+ -DEBUILDER_HASH=${EBUILDER_HASH} \
+ -DBUILD_HOME=${BUILD_HOME}
diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml
index e415e301..a49e792b 100644
--- a/production/sdk/collectTestResults.xml
+++ b/production/sdk/collectTestResults.xml
@@ -28,22 +28,31 @@
description="Collect Test Results from Hudson to build machine location.">
- <mkdir dir="${tmpzipdir}" />
<retry
retrycount="3"
retrydelay="1000">
<get
+ ignoreerrors="true"
+ verbose="true"
src="${hudsonResultURL}"
dest="${tmpzipdir}/archive.zip" />
</retry>
- <mkdir dir="${postingDirectory}/${buildId}/testresults" />
+ <echo message="hudsonTestResultsURL ${hudsonTestResultsURL} " />
+ <retry
+ retrycount="3"
+ retrydelay="1000">
+ <get
+ src="${hudsonTestResultsURL}"
+ dest="${resultsDir}/${job}-${buildNumber}.xml" />
+ </retry>
+
<unzip
overwrite="true"
src="${tmpzipdir}/archive.zip"
- dest="${postingDirectory}/${buildId}/testresults/">
+ dest="${resultsDir}/">
<globmapper
from="archive/workarea/${buildId}/eclipse-testing/results/*"
to="*" />
@@ -53,8 +62,8 @@
<arg line="/shared/eclipse/sdk/promotion/updateDropLocation.sh ${eclipseStream} ${buildId} ${EBUILDER_HASH}" />
</exec>
- <delete>
- <fileset dir="${postingDirectory}/${buildId}/testresults">
+ <delete failonerror="false">
+ <fileset dir="${resultsDir}">
<include name="${tmpzipdir}" />
<include name="archive/**" />
</fileset>
@@ -67,11 +76,12 @@
unless="collectTestResultsInitialized">
<property environment="env" />
+ <echo message="env.BUILD_HOME: ${env.BUILD_HOME}" />
- <!-- we set these "env" variables here not to effect the
- environment, but that because we need some value for them,
- so if not actually set in the environment, we create these
- with some reasonable default. (Though, if not set in the environment,
+ <!-- we set these "env" variables here not to effect the
+ environment, but that because we need some value for them,
+ so if not actually set in the environment, we create these
+ with some reasonable default. (Though, if not set in the environment,
could be a sign that somethign is not as expected?)
-->
<property
@@ -86,6 +96,7 @@
<echo message="env.BUILD_HOME: ${env.BUILD_HOME}" />
+
<script language="javascript"><![CDATA[
var buildId = project.getProperty("buildId");
var patternbuildType = new RegExp(/^([IMXYNSR])(\d{8})-(\d{4})$/);
@@ -106,11 +117,11 @@
project.setProperty("eclipseStreamMajor", eclipseStreamMajor);
project.setProperty("eclipseStreamMinor", eclipseStreamMinor);
project.setProperty("eclipseStreamService", eclipseStreamService);
-
+
var buildhome = project.getProperty("env.BUILD_HOME");
-
- var buildRoot= buildhome + "/" + eclipseStreamMajor + buildType;
+ var buildRoot= buildhome + "/" + eclipseStreamMajor + buildType;
+ project.setProperty("buildRoot", buildRoot);
var siteDir= buildRoot + "/siteDir";
var postingDirectory = siteDir + "/eclipse/downloads/drops"
if (eclipseStreamMajor > 3 )
@@ -124,18 +135,35 @@
<echo message="buildRoot: ${buildRoot}" />
<echo message="postingDirectory: ${postingDirectory}" />
+ <property
+ name="resultsDir"
+ value="${postingDirectory}/${buildId}/testresults" />
+ <!-- attempt to create incase hasn't been created yet -->
+ <mkdir dir="${resultsDir}" />
+ <property
+ name="hudsonResultRootJobURL"
+ value="${env.HUDSON_PROTOCOL}://${env.HUDSON_HOST}/hudson/job/${job}/${buildNumber}/" />
<property
name="hudsonResultRootURL"
- value="${env.HUDSON_PROTOCOL}://${env.HUDSON_HOST}/hudson/job/${job}/${buildNumber}/artifact/*zip*" />
+ value="${hudsonResultRootJobURL}/artifact/*zip*" />
<property
name="hudsonResultURL"
value="${hudsonResultRootURL}/archive.zip" />
<echo message="hudsonResultURL ${hudsonResultURL} " />
<property
+ name="hudsonTestResultsURL"
+ value="${hudsonResultRootJobURL}/testReport/api/xml?tree=failCount,passCount,skipCount,duration" />
+ <echo message="hudsonTestResultsURL ${hudsonTestResultsURL} " />
+
+ <property
name="tmpzipdir"
- value="${postingDirectory}/${buildId}/testresults/tmp${job}" />
+ value="${resultsDir}/tmp${job}" />
+
+
+
+ <mkdir dir="${tmpzipdir}" />
<property
name="collectTestResultsInitialized"

Back to the top