Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2018-05-07 03:05:22 -0400
committerSravan Kumar Lakkimsetti2018-05-07 03:06:16 -0400
commitfa74c2b3586af2054bd48a3036cec7afcf125c4d (patch)
tree28ab07ea1c187f6639c0a2782a196411d1adfebd
parent1f91895d3690ffd2ba32339f10efad98e64cd5d2 (diff)
downloadeclipse.platform.releng.aggregator-fa74c2b3586af2054bd48a3036cec7afcf125c4d.tar.gz
eclipse.platform.releng.aggregator-fa74c2b3586af2054bd48a3036cec7afcf125c4d.tar.xz
eclipse.platform.releng.aggregator-fa74c2b3586af2054bd48a3036cec7afcf125c4d.zip
Revert "Bug 531440 - Need a windows slave attached to releng jipp"
This reverts commit ae28923958a0695ab1e92f0dde03148fe75f54f8. Revert "Bug 531440 - Need a windows slave attached to releng jipp" This reverts commit 73a3c69388ebf6254e5d428259045bb85605e1dc.
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php2
-rw-r--r--production/sdk/collectTestResults.xml9
-rwxr-xr-xproduction/sdk/promotion/updateDropLocation.sh3
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/win7-64/platformSpecific.properties2
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/win7/platformSpecific.properties2
-rw-r--r--production/testScripts/invokeTestsJSON.xml2
8 files changed, 18 insertions, 6 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
index e754f511..9dfbf1de 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
@@ -245,7 +245,7 @@
<!-- else normal unit tests configs -->
<property
name="testsConfigExpected"
- value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk2_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java9_linux.gtk.x86_64_9" />
+ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk2_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java9_linux.gtk.x86_64_9" />
<echo message=" = = properties in publish.xml == " />
<echo message=" job: ${job}" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
index 853a44e1..cfdc4d65 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
@@ -268,7 +268,7 @@
<!-- else normal unit tests configs -->
<property
name="testsConfigExpected"
- value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk2_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java9_linux.gtk.x86_64_9" />
+ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk2_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java9_linux.gtk.x86_64_9" />
<echo message=" = = properties in publish.xml == " />
<echo message=" job: ${job}" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
index b009a83b..977cb272 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
@@ -14,5 +14,5 @@ $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3_linux.gtk.x86_64_8.0";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java9_linux.gtk.x86_64_9";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64_macosx.cocoa.x86_64_8.0";
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32_win32.win32.x86_64_8.0";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32_win32.win32.x86_8.0";
diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml
index b954c809..1ddf6a69 100644
--- a/production/sdk/collectTestResults.xml
+++ b/production/sdk/collectTestResults.xml
@@ -97,6 +97,15 @@
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 0ef3a655..38eaad77 100755
--- a/production/sdk/promotion/updateDropLocation.sh
+++ b/production/sdk/promotion/updateDropLocation.sh
@@ -258,6 +258,9 @@ 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 f63d90f6..887c9f42 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_162\\jre\\bin\\java.exe
+jvm=c\:\\Program Files\\Java\\jdk1.8.0_51\\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 8ede3ed0..8c26fc41 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_162\\jre\\bin\\java.exe
+jvm=c\:\\Program Files\\Java\\jdk1.8.0_51\\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 0df3f809..a857f6f7 100644
--- a/production/testScripts/invokeTestsJSON.xml
+++ b/production/testScripts/invokeTestsJSON.xml
@@ -47,7 +47,7 @@
for greater flexibility in what to test?)
-->
- <antcall target="triggerHudsonTests">
+ <antcall target="triggerHudsonWinTests">
<param
name="job"
value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32" />

Back to the top