diff options
4 files changed, 9 insertions, 15 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml index 4d6dda2af..7343528e1 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2016 IBM Corporation and others. + Copyright (c) 2016, 2018 IBM Corporation and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 @@ -248,7 +248,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_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java10_linux.gtk.x86_64_10" /> + value="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-java10_linux.gtk.x86_64_10" /> <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 906e2b249..215f59af2 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2016 IBM Corporation and others. + Copyright (c) 2016, 2018 IBM Corporation and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 @@ -271,7 +271,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_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java10_linux.gtk.x86_64_10" /> + value="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-java10_linux.gtk.x86_64_10" /> <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 f12fdeb00..d8c3291fd 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php @@ -10,7 +10,6 @@ include("buildproperties.php"); $expectedTestConfigs = array(); -$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk2_linux.gtk.x86_64_8.0"; $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-java10_linux.gtk.x86_64_10"; $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64_macosx.cocoa.x86_64_8.0"; diff --git a/production/testScripts/invokeTestsJSON.xml b/production/testScripts/invokeTestsJSON.xml index 0aa1bb90d..130dbb822 100644 --- a/production/testScripts/invokeTestsJSON.xml +++ b/production/testScripts/invokeTestsJSON.xml @@ -1,9 +1,10 @@ -<!-- Copyright (c) 2011, 2014 IBM Corporation and others. All rights reserved. +<!-- Copyright (c) 2011, 2018 IBM Corporation and others. + This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, -t https://www.eclipse.org/legal/epl-2.0/ -t -t SPDX-License-Identifier: EPL-2.0. + https://www.eclipse.org/legal/epl-2.0/ + + SPDX-License-Identifier: EPL-2.0. Contributors: IBM Corporation - initial API and implementation @@ -69,12 +70,6 @@ t SPDX-License-Identifier: EPL-2.0. <antcall target="triggerHudsonTests"> <param name="job" - value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk2" /> - </antcall> - - <antcall target="triggerHudsonTests"> - <param - name="job" value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3" /> </antcall> |