Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2018-06-26 07:34:35 -0400
committerSravan Kumar Lakkimsetti2018-06-26 07:38:10 -0400
commit55afb2f8d6919c06870d51c4a1248df178f20bb8 (patch)
tree7972e6ebb73b9657ce19d8c1f96df81e8448abd6 /production
parent0d9563a5354b0f97888476a59aad4826c9ccdd38 (diff)
downloadeclipse.platform.releng.aggregator-55afb2f8d6919c06870d51c4a1248df178f20bb8.tar.gz
eclipse.platform.releng.aggregator-55afb2f8d6919c06870d51c4a1248df178f20bb8.tar.xz
eclipse.platform.releng.aggregator-55afb2f8d6919c06870d51c4a1248df178f20bb8.zip
Revert "Revert "Bug 531438 - Need one more executor of mac slave on releng jipp""
Diffstat (limited to 'production')
-rw-r--r--production/sdk/collectTestResults.xml9
-rwxr-xr-xproduction/sdk/promotion/updateDropLocation.sh3
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties4
-rw-r--r--production/testScripts/invokeTestsJSON.xml2
4 files changed, 3 insertions, 15 deletions
diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml
index 1ddf6a69..bb8eacd3 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 38eaad77..d3cd5eb3 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 c2ecab44..b5424f6c 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 55633a0d..19351182 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" />

Back to the top