Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2017-05-30 08:43:33 -0400
committerSravan Kumar Lakkimsetti2017-05-30 08:43:52 -0400
commitb66076a6f6de65222478d4cb7daaeb17694cc5cb (patch)
treefaa83fef1930ccfb7457160173bcb17d462b0984 /production
parent25bf9413c01a2a673eba801d6ea49224b56b86b4 (diff)
downloadeclipse.platform.releng.aggregator-b66076a6f6de65222478d4cb7daaeb17694cc5cb.tar.gz
eclipse.platform.releng.aggregator-b66076a6f6de65222478d4cb7daaeb17694cc5cb.tar.xz
eclipse.platform.releng.aggregator-b66076a6f6de65222478d4cb7daaeb17694cc5cb.zip
Bug 509922 - Performance tests are giving invalid test results
Change-Id: I0ef86c4e62dfd78ddcf72fe137f024e9c5530947 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'production')
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/test.xml8
-rw-r--r--production/testScripts/configuration/streamSpecific.properties1
-rw-r--r--production/testScripts/runTests2.xml10
3 files changed, 16 insertions, 3 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index f082cbe9..e179414e 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -647,9 +647,15 @@
<property environment="env" />
+ <condition
+ property="repoBuildIdToUse"
+ value="${baselinePerfBuildId}"
+ else="${buildId}">
+ <istrue value="${baselinePerf}" />
+ </condition>
<property
name="repoZip"
- value="${executionDir}/eclipse-junit-tests-${buildId}.zip" />
+ value="${executionDir}/eclipse-junit-tests-${repoBuildIdToUse}.zip" />
<echo message="repoZip: ${repoZip}" />
<property
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 02282291..dccec2b4 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -38,6 +38,7 @@ baselinePerfLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.6-20160
baselinePerfVersion=R-4.6-201606061100
# TODO: could/should eventually "compute" label, from full version?
baselinePerfVersionLabel=4.6
+baselinePerfBuildId=I20160606-1100
eclipse.perf.dbloc.value=//172.25.25.57:1527
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 7bde22d0..f0028bac 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -39,6 +39,12 @@
<istrue value="${baselinePerf}" />
</condition>
<condition
+ property="repoBuildIdToUse"
+ value="${baselinePerfBuildId}"
+ else="${buildId}">
+ <istrue value="${baselinePerf}" />
+ </condition>
+ <condition
property="archiveLocation"
value="${baselinePerfLocation}"
else="${buildURL}">
@@ -500,7 +506,7 @@
setupRepo task. -->
<property
name="repoZip"
- value="${executionDir}/eclipse-junit-tests-${buildIdToUse}.zip" />
+ value="${executionDir}/eclipse-junit-tests-${repoBuildIdToUse}.zip" />
<echo message="repoZip: ${repoZip}" />
<antcall target="unzipTestFramework" />
@@ -885,7 +891,7 @@
<property
name="repoZip"
- value="${executionDir}/eclipse-junit-tests-${buildId}.zip" />
+ value="${executionDir}/eclipse-junit-tests-${repoBuildIdToUse}.zip" />
<echo message="repoZip: ${repoZip}" />
<property

Back to the top