diff options
5 files changed, 4 insertions, 20 deletions
diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml index bb8eacd30..df95cbf65 100644 --- a/production/sdk/collectTestResults.xml +++ b/production/sdk/collectTestResults.xml @@ -92,15 +92,6 @@ <isset property="env.WORKSPACE"/> </condition> - <condition - property="env.HUDSON_ROOT_URI" - value="shared"> - <contains - string="${job}" - substring="win32" - casesensitive="yes" /> - </condition> - <property name="env.HUDSON_ROOT_URI" value="releng" /> diff --git a/production/sdk/promotion/updateDropLocation.sh b/production/sdk/promotion/updateDropLocation.sh index d3cd5eb37..79122d139 100755 --- a/production/sdk/promotion/updateDropLocation.sh +++ b/production/sdk/promotion/updateDropLocation.sh @@ -257,14 +257,7 @@ function sendTestResultsMail () fi 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" - ;; - *) - HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/${HUDSON_ROOT_URI}/view/Automated tests" - ;; - esac + HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/${HUDSON_ROOT_URI}/view/Automated tests" # Now read "elapsed time" duration from Hudson. (The time above is the sum of all unit tests times, # so does not include "overhead" and is deceptive.) The "-O -" means send output to standard out (instead of file). 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 ddba551ff..113391fdc 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 1b4323a21..c29b9ffa8 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 130dbb822..762f83cfb 100644 --- a/production/testScripts/invokeTestsJSON.xml +++ b/production/testScripts/invokeTestsJSON.xml @@ -50,7 +50,7 @@ for greater flexibility in what to test?) --> - <antcall target="triggerHudsonWinTests"> + <antcall target="triggerHudsonTests"> <param name="job" value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32" /> |