Revert "Bug 531438 - Need one more executor of mac slave on releng jipp"
This reverts commit 6dc4a895f864ebfcc9b08b23e43fb02c14392b28.
diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml
index bb8eacd..1ddf6a6 100644
--- a/production/sdk/collectTestResults.xml
+++ b/production/sdk/collectTestResults.xml
@@ -101,6 +101,15 @@
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 d3cd5eb..38eaad7 100755
--- a/production/sdk/promotion/updateDropLocation.sh
+++ b/production/sdk/promotion/updateDropLocation.sh
@@ -261,6 +261,9 @@
"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 b5424f6..c2ecab4 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_172.jdk/Contents/Home/jre/bin/java
+jvm=/Library/Java/JavaVirtualMachines/jdk1.8.0_51.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 @@
eclipse.preferences.version=1\n\
org.eclipse.core.net.hasMigrated=true\n
-cvstest.properties=/Users/genie.releng/cvstest.properties
+cvstest.properties=/Users/genie.shared/cvstest.properties
diff --git a/production/testScripts/invokeTestsJSON.xml b/production/testScripts/invokeTestsJSON.xml
index cb106cf..a857f6f 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="triggerHudsonTests">
+ <antcall target="triggerHudsonWinTests">
<param
name="job"
value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64" />
