diff options
author | Sravan Kumar Lakkimsetti | 2018-04-24 09:16:58 +0000 |
---|---|---|
committer | Sravan Kumar Lakkimsetti | 2018-04-24 09:16:58 +0000 |
commit | 73a3c69388ebf6254e5d428259045bb85605e1dc (patch) | |
tree | 17047df0b73b439e4dcdf95badf0441fdd6698aa /production | |
parent | 4966d85748e96a5b39b6c99eee88c03084392ed8 (diff) | |
download | eclipse.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>
Diffstat (limited to 'production')
5 files changed, 3 insertions, 15 deletions
diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml index 1ddf6a69e..b954c809f 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 38eaad772..0ef3a655b 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 887c9f427..f63d90f6e 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 8c26fc419..8ede3ed07 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 a857f6f74..0df3f8097 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" /> |