From 88a55650f23122b90249ed5a6b406d6bee1c6311 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sun, 19 Apr 2026 21:58:03 +0200 Subject: [PATCH] [RelEng] Move last script from tychoeclipsebuilder project to scripts Keeping the tychoeclipsebuilder Project for just one ANT script is not necessary. --- .project | 2 +- .../AutomatedTests/integrationTests.jenkinsfile | 5 ++--- eclipse.platform.releng.tychoeclipsebuilder/.project | 11 ----------- .../.settings/org.eclipse.core.resources.prefs | 2 -- .../.settings/org.eclipse.core.runtime.prefs | 2 -- oomph/Platform.setup | 2 +- .../testing}/publishingFiles/testManifest.xml | 0 7 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/.project delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.resources.prefs delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.runtime.prefs rename {eclipse.platform.releng.tychoeclipsebuilder/eclipse => scripts/testing}/publishingFiles/testManifest.xml (100%) diff --git a/.project b/.project index c6289ce77a2..175c44da63c 100644 --- a/.project +++ b/.project @@ -15,7 +15,7 @@ 30 org.eclipse.ui.ide.multiFilter - 1.0-projectRelativePath-matches-true-true-(eclipse.platform.releng.prereqs.sdk|eclipse.platform.releng.tychoeclipsebuilder|oomph|products|scripts|sites)/.* + 1.0-projectRelativePath-matches-true-true-(eclipse.platform.releng.prereqs.sdk|oomph|products|scripts|sites)/.* diff --git a/JenkinsJobs/AutomatedTests/integrationTests.jenkinsfile b/JenkinsJobs/AutomatedTests/integrationTests.jenkinsfile index e1e38fa2da4..9ae40c9fcaa 100644 --- a/JenkinsJobs/AutomatedTests/integrationTests.jenkinsfile +++ b/JenkinsJobs/AutomatedTests/integrationTests.jenkinsfile @@ -56,8 +56,7 @@ pipeline { [path: 'JenkinsJobs/buildConfigurations.json'], [path: 'JenkinsJobs/shared/utilities.groovy'], [path: 'scripts/releng'], - [path: 'eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles'], - + [path: 'scripts/testing'], ])]) script { def buildConfigurations = readJSON(file: 'JenkinsJobs/buildConfigurations.json') @@ -118,7 +117,7 @@ pipeline { java \ -DxmlDirectory="${WORKSPACE}/${localResultsDirectory}/xml" \ -DtestsConfigExpected=${JOB_BASE_NAME} \ - -DtestManifestFile="${WORKSPACE}/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml" \ + -DtestManifestFile="${WORKSPACE}/scripts/testing/publishingFiles/testManifest.xml" \ TestResultsGenerator popd diff --git a/eclipse.platform.releng.tychoeclipsebuilder/.project b/eclipse.platform.releng.tychoeclipsebuilder/.project deleted file mode 100644 index cf64e5c490a..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.eclipse.platform.releng.tychoeclipsebuilder - - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22d2a7..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -line.separator=\n diff --git a/oomph/Platform.setup b/oomph/Platform.setup index 4fe716c0803..500ecd894c3 100644 --- a/oomph/Platform.setup +++ b/oomph/Platform.setup @@ -737,7 +737,7 @@ xsi:type="predicates:AndPredicate"> + project="eclipse.platform.releng.aggregator"/> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/scripts/testing/publishingFiles/testManifest.xml similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml rename to scripts/testing/publishingFiles/testManifest.xml