Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2020-06-14 16:51:41 +0000
committerAlexander Kurtakov2020-06-14 16:51:41 +0000
commit625452f1a5fd5280ea84cb5da28f73106f8bb31e (patch)
tree3cbb504e7e8bd48ec0717b8db228710f38767d78
parent67c59ab7efc82157fef7d953d2f2dd1798a55382 (diff)
downloadeclipse.platform.releng.aggregator-625452f1a5fd5280ea84cb5da28f73106f8bb31e.tar.gz
eclipse.platform.releng.aggregator-625452f1a5fd5280ea84cb5da28f73106f8bb31e.tar.xz
eclipse.platform.releng.aggregator-625452f1a5fd5280ea84cb5da28f73106f8bb31e.zip
Bug 564128 - Switch Mac test run to use Java 11
Adapt scripts to renamed jobs and the fact they run with Java 11. Change-Id: I326438f9816d16d5b4b145778d5b4bd347599b85 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-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
3 files changed, 3 insertions, 3 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
index 8d88249af..3b84ce593 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
@@ -248,7 +248,7 @@
<!-- else normal unit tests configs -->
<property
name="testsConfigExpected"
- value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java8_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java8_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java14_linux.gtk.x86_64_14" />
+ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java8_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java14_linux.gtk.x86_64_14" />
<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 70c5168ca..74bbcd689 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
@@ -271,7 +271,7 @@
<!-- else normal unit tests configs -->
<property
name="testsConfigExpected"
- value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java8_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java8_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java14_linux.gtk.x86_64_14" />
+ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java8_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java14_linux.gtk.x86_64_14" />
<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 71130504c..4ecc55065 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
@@ -10,7 +10,7 @@
include("buildproperties.php");
$expectedTestConfigs = array();
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64-java8_macosx.cocoa.x86_64_8.0";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64-java11_macosx.cocoa.x86_64_11";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32-java8_win32.win32.x86_64_8.0";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java11_linux.gtk.x86_64_11";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java14_linux.gtk.x86_64_14";

Back to the top