Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-02-21 14:28:27 +0000
committerDavid Williams2013-02-21 14:28:27 +0000
commita8e2c14b21689933e9e83cf5b38434f45378b216 (patch)
tree3c7377c364413ad9b03649896d1df49d5bfd66ca
parent6ba67086b29cf8c5dcf80822f0fc55b461481146 (diff)
downloadeclipse.platform.releng.aggregator-a8e2c14b21689933e9e83cf5b38434f45378b216.tar.gz
eclipse.platform.releng.aggregator-a8e2c14b21689933e9e83cf5b38434f45378b216.tar.xz
eclipse.platform.releng.aggregator-a8e2c14b21689933e9e83cf5b38434f45378b216.zip
[releng] Prep for transition
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/test.xml6
-rw-r--r--production/testScripts/genTestIndexes.xml4
-rw-r--r--production/testScripts/runTests2.xml4
-rwxr-xr-xproduction/testScripts/startTests.sh4
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh13
5 files changed, 18 insertions, 13 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index b9e755e5..5c75466e 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -1292,7 +1292,7 @@
<target name="all">
<antcall target="quickTests" />
- <antcall target="longRunningTests" />
+ <!--TEMP <antcall target="longRunningTests" /> -->
</target>
@@ -1315,7 +1315,7 @@
name="message"
value="end platform" />
</antcall>
-
+<!--TEMP
<antcall target="markCurrentTime">
<param
name="message"
@@ -1345,7 +1345,7 @@
name="message"
value="end quickTests" />
</antcall>
-
+-->
</target>
<target name="longRunningTests">
diff --git a/production/testScripts/genTestIndexes.xml b/production/testScripts/genTestIndexes.xml
index 42954789..6c56db07 100644
--- a/production/testScripts/genTestIndexes.xml
+++ b/production/testScripts/genTestIndexes.xml
@@ -33,8 +33,8 @@
<condition
property="dropsDirXSegment"
- value="${dropsDirSegment}cbibased"
- else="${dropsDirSegment}">
+ value="${dropsDirSegment}"
+ else="${dropsDirSegment}pdebased">
<equals
arg1="${BUILD_TECH}"
arg2="CBI" />
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 97e3e269..3b2e3b98 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -80,8 +80,8 @@
<condition
property="dropsSuffix"
- value="cbibased"
- else="">
+ value=""
+ else="pdebased">
<equals
arg1="${BUILD_TECH}"
arg2="CBI" />
diff --git a/production/testScripts/startTests.sh b/production/testScripts/startTests.sh
index a7fe84f0..74eaa6fb 100755
--- a/production/testScripts/startTests.sh
+++ b/production/testScripts/startTests.sh
@@ -50,9 +50,9 @@ function dlpath()
#TODO: eventual switch so CBI is "normal" one and PDE is marked one
if [[ "${BUILD_TECH}" == 'CBI' ]]
then
- dropsuffix=cbibased
- else
dropsuffix=""
+ else
+ dropsuffix="pdebased"
fi
pathToDL=eclipse/downloads/drops
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index 7c0a190e..dc19601f 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -48,16 +48,21 @@ fi
pathToDL=eclipse/downloads/drops$eclipseStreamMajor
fi
- if [[ "$BUILD_TECH" == "CBI" ]]
+ if [[ "$BUILD_TECH" == "PDE" ]]
then
- pathToDL="${pathToDL}cbibased"
+ pathToDL="${pathToDL}pdebased"
fi
- buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType}
if [[ "$BUILD_TECH" == "CBI" ]]
then
buildRoot=/shared/eclipse/builds/${eclipseStreamMajor}${buildType}
- fi
+ elif [[ "$BUILD_TECH" == "PDE" ]]
+ then
+ buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType}
+ else
+ echo "ERROR: BUILD_TECH was neither PDE nor CBI."
+ exit 1
+ fi
siteDir=${buildRoot}/siteDir

Back to the top