Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2018-04-24 05:16:58 -0400
committerSravan Kumar Lakkimsetti2018-04-24 05:16:58 -0400
commit73a3c69388ebf6254e5d428259045bb85605e1dc (patch)
tree17047df0b73b439e4dcdf95badf0441fdd6698aa
parent4966d85748e96a5b39b6c99eee88c03084392ed8 (diff)
downloadeclipse.platform.releng.aggregator-73a3c69388ebf6254e5d428259045bb85605e1dc.tar.gz
eclipse.platform.releng.aggregator-73a3c69388ebf6254e5d428259045bb85605e1dc.tar.xz
eclipse.platform.releng.aggregator-73a3c69388ebf6254e5d428259045bb85605e1dc.zip
Bug 531440 - Need a windows slave attached to releng jipp
Switching to windows 10 machine for tests Change-Id: I19b4723502a527bd9854616876772e2f7a86adec Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--production/sdk/collectTestResults.xml9
-rwxr-xr-xproduction/sdk/promotion/updateDropLocation.sh3
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/win7-64/platformSpecific.properties2
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/win7/platformSpecific.properties2
-rw-r--r--production/testScripts/invokeTestsJSON.xml2
5 files changed, 3 insertions, 15 deletions
diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml
index 1ddf6a69..b954c809 100644
--- a/production/sdk/collectTestResults.xml
+++ b/production/sdk/collectTestResults.xml
@@ -97,15 +97,6 @@
value="shared">
<contains
string="${job}"
- substring="win32"
- casesensitive="yes" />
- </condition>
-
- <condition
- property="env.HUDSON_ROOT_URI"
- value="shared">
- <contains
- string="${job}"
substring="mac64"
casesensitive="yes" />
</condition>
diff --git a/production/sdk/promotion/updateDropLocation.sh b/production/sdk/promotion/updateDropLocation.sh
index 38eaad77..0ef3a655 100755
--- a/production/sdk/promotion/updateDropLocation.sh
+++ b/production/sdk/promotion/updateDropLocation.sh
@@ -258,9 +258,6 @@ function sendTestResultsMail ()
platform=$(echo ${JOB_NAME}|cut -b 12-16)
case "$platform" in
- "win32")
- HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/shared/view/Eclipse and Equinox"
- ;;
"mac64")
HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/shared/view/Eclipse and Equinox"
;;
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 887c9f42..f63d90f6 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/platformSpecific.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/platformSpecific.properties
@@ -12,7 +12,7 @@
# This is the VM to use to run the tests, if one prefers
# to use a different one from the one that stared the whole process.
-jvm=c\:\\Program Files\\Java\\jdk1.8.0_51\\jre\\bin\\java.exe
+jvm=c\:\\Program Files\\Java\\jdk1.8.0_162\\jre\\bin\\java.exe
# TODO: can also list VMs to use for specific execution environments
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/win7/platformSpecific.properties
index 8c26fc41..8ede3ed0 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/win7/platformSpecific.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7/platformSpecific.properties
@@ -12,7 +12,7 @@
# This is the VM to use to run the tests, if one prefers
# to use a different one from the one that stared the whole process.
-jvm=c\:\\Program Files\\Java\\jdk1.8.0_51\\jre\\bin\\java.exe
+jvm=c\:\\Program Files\\Java\\jdk1.8.0_162\\jre\\bin\\java.exe
# TODO: can also list VMs to use for specific execution environments
diff --git a/production/testScripts/invokeTestsJSON.xml b/production/testScripts/invokeTestsJSON.xml
index a857f6f7..0df3f809 100644
--- a/production/testScripts/invokeTestsJSON.xml
+++ b/production/testScripts/invokeTestsJSON.xml
@@ -47,7 +47,7 @@
for greater flexibility in what to test?)
-->
- <antcall target="triggerHudsonWinTests">
+ <antcall target="triggerHudsonTests">
<param
name="job"
value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32" />

Back to the top