Bug 497030 - unit tests are not being "published"

Change-Id: I953f3dd45ebdadf88636c5430a0ea53f5c50eee1

4 files changed, 15 insertions, 11 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
index 0581530f3..f91d352b0 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
@@ -226,16 +226,18 @@
       the end of the filename. (Not sure of impact of "LR" on our
       heuristics.)
     -->
+    <fail unless="eclipseStreamMajor" message="This publish.xml script needs eclipseStreamMajor and eclipseStreamMinor" />
+    <fail unless="eclipseStreamMinor" message="This publish.xml script needs eclipseStreamMajor and eclipseStreamMinor"/>
     <condition
       property="perfLRtestsConfigExpected"
-      value="ep46${buildType}LR-perf-lin64_linux.gtk.x86_64_8.0,ep46${buildType}LR-perf-lin64-baseline_linux.gtk.x86_64_8.0">
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}LR-perf-lin64_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}LR-perf-lin64-baseline_linux.gtk.x86_64_8.0">
       <contains
         string="${job}"
         substring="LR-perf-" />
     </condition>
     <condition
       property="testsConfigExpected"
-      value="ep46${buildType}-perf-lin64_linux.gtk.x86_64_8.0,ep46${buildType}-perf-lin64-baseline_linux.gtk.x86_64_8.0">
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-perf-lin64_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-perf-lin64-baseline_linux.gtk.x86_64_8.0">
       <contains
         string="${job}"
         substring="-perf-" />
@@ -243,7 +245,7 @@
     <!-- else normal unit tests configs -->
     <property
       name="testsConfigExpected"
-      value="ep46${buildType}-unit-lin64_linux.gtk.x86_64_8.0,ep46${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep46${buildType}-unit-win32_win32.win32.x86_8.0,ep46${buildType}-unit-cen64_linux.gtk.x86_64_8.0" />
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-lin64_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_linux.gtk.x86_64_8.0" />
 
     <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 77e14d007..71e27a773 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
@@ -249,16 +249,18 @@
       the end of the filename. (Not sure of impact of "LR" on our
       heuristics.)
     -->
+    <fail unless="eclipseStreamMajor" message="This publish.xml script needs eclipseStreamMajor and eclipseStreamMinor" />
+    <fail unless="eclipseStreamMinor" message="This publish.xml script needs eclipseStreamMajor and eclipseStreamMinor"/>
     <condition
       property="perfLRConfigExpected"
-      value="ep46${buildType}LR-perf-lin64_linux.gtk.x86_64_8.0,ep46${buildType}LR-perf-lin64-baseline_linux.gtk.x86_64_8.0">
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}LR-perf-lin64_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}LR-perf-lin64-baseline_linux.gtk.x86_64_8.0">
       <contains
         string="${job}"
         substring="LR-perf-" />
     </condition>
     <condition
       property="perfConfigExpected"
-      value="ep46${buildType}-perf-lin64_linux.gtk.x86_64_8.0,ep46${buildType}-perf-lin64-baseline_linux.gtk.x86_64_8.0">
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-perf-lin64_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-perf-lin64-baseline_linux.gtk.x86_64_8.0">
       <contains
         string="${job}"
         substring="-perf-" />
@@ -266,7 +268,7 @@
     <!-- else normal unit tests configs -->
     <property
       name="testsConfigExpected"
-      value="ep46${buildType}-unit-lin64_linux.gtk.x86_64_8.0,ep46${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep46${buildType}-unit-win32_win32.win32.x86_8.0,ep46${buildType}-unit-cen64_linux.gtk.x86_64_8.0" />
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-lin64_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_linux.gtk.x86_64_8.0" />
 
     <echo message=" = = properties in publish.xml == " />
     <echo message="     job: ${job}" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perfTestConfigs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perfTestConfigs.php
index aa73958c2..9fef4cf9e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perfTestConfigs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perfTestConfigs.php
@@ -10,5 +10,5 @@
 include("buildproperties.php");
 
 $expectedTestConfigs = array();
-$expectedTestConfigs[]="ep46$TESTED_BUILD_TYPE-perf-lin64_linux.gtk.x86_64_8.0";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-perf-lin64_linux.gtk.x86_64_8.0";
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
index 62acad13c..ee15a9c88 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
@@ -10,8 +10,8 @@
 include("buildproperties.php");
 
 $expectedTestConfigs = array();
-$expectedTestConfigs[]="ep46$TESTED_BUILD_TYPE-unit-cen64_linux.gtk.x86_64_8.0";
-$expectedTestConfigs[]="ep46$TESTED_BUILD_TYPE-unit-lin64_linux.gtk.x86_64_8.0";
-$expectedTestConfigs[]="ep46$TESTED_BUILD_TYPE-unit-mac64_macosx.cocoa.x86_64_8.0";
-$expectedTestConfigs[]="ep46$TESTED_BUILD_TYPE-unit-win32_win32.win32.x86_8.0";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64_linux.gtk.x86_64_8.0";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-lin64_linux.gtk.x86_64_8.0";
+$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_8.0";