diff options
4 files changed, 3 insertions, 15 deletions
diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml index 1ddf6a69e..bb8eacd30 100644 --- a/production/sdk/collectTestResults.xml +++ b/production/sdk/collectTestResults.xml @@ -101,15 +101,6 @@ casesensitive="yes" /> </condition> - <condition - property="env.HUDSON_ROOT_URI" - value="shared"> - <contains - string="${job}" - substring="mac64" - 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 38eaad772..d3cd5eb37 100755 --- a/production/sdk/promotion/updateDropLocation.sh +++ b/production/sdk/promotion/updateDropLocation.sh @@ -261,9 +261,6 @@ function sendTestResultsMail () "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" - ;; *) HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/${HUDSON_ROOT_URI}/view/Automated tests" ;; diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties index c2ecab447..b5424f6c9 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties @@ -13,7 +13,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=/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java -jvm=/Library/Java/JavaVirtualMachines/jdk1.8.0_51.jdk/Contents/Home/jre/bin/java +jvm=/Library/Java/JavaVirtualMachines/jdk1.8.0_172.jdk/Contents/Home/jre/bin/java # TODO: can also list VMs to use for specific execution environments # https://bugs.eclipse.org/bugs/show_bug.cgi?id=392213 @@ -36,4 +36,4 @@ org.eclipse.core.net.prefs=\ eclipse.preferences.version=1\n\ org.eclipse.core.net.hasMigrated=true\n -cvstest.properties=/Users/genie.shared/cvstest.properties +cvstest.properties=/Users/genie.releng/cvstest.properties diff --git a/production/testScripts/invokeTestsJSON.xml b/production/testScripts/invokeTestsJSON.xml index 55633a0dd..193511820 100644 --- a/production/testScripts/invokeTestsJSON.xml +++ b/production/testScripts/invokeTestsJSON.xml @@ -53,7 +53,7 @@ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32" /> </antcall> - <antcall target="triggerHudsonWinTests"> + <antcall target="triggerHudsonTests"> <param name="job" value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64" /> |