Skip to content

Commit e519ac9

Browse files
committed
[RelEng] Move last script from tychoeclipsebuilder project to scripts
Keeping the tychoeclipsebuilder Project for just one ANT script is not necessary.
1 parent c8066d7 commit e519ac9

7 files changed

Lines changed: 4 additions & 20 deletions

File tree

.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<type>30</type>
1616
<matcher>
1717
<id>org.eclipse.ui.ide.multiFilter</id>
18-
<arguments>1.0-projectRelativePath-matches-true-true-(eclipse.platform.releng.prereqs.sdk|eclipse.platform.releng.tychoeclipsebuilder|oomph|products|scripts|sites)/.*</arguments>
18+
<arguments>1.0-projectRelativePath-matches-true-true-(eclipse.platform.releng.prereqs.sdk|oomph|products|scripts|sites)/.*</arguments>
1919
</matcher>
2020
</filter>
2121
</filteredResources>

JenkinsJobs/AutomatedTests/integrationTests.jenkinsfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ pipeline {
5656
[path: 'JenkinsJobs/buildConfigurations.json'],
5757
[path: 'JenkinsJobs/shared/utilities.groovy'],
5858
[path: 'scripts/releng'],
59-
[path: 'eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles'],
60-
59+
[path: 'scripts/testing'],
6160
])])
6261
script {
6362
def buildConfigurations = readJSON(file: 'JenkinsJobs/buildConfigurations.json')
@@ -118,7 +117,7 @@ pipeline {
118117
java \
119118
-DxmlDirectory="${WORKSPACE}/${localResultsDirectory}/xml" \
120119
-DtestsConfigExpected=${JOB_BASE_NAME} \
121-
-DtestManifestFile="${WORKSPACE}/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml" \
120+
-DtestManifestFile="${WORKSPACE}/scripts/testing/publishingFiles/testManifest.xml" \
122121
TestResultsGenerator
123122
popd
124123

eclipse.platform.releng.tychoeclipsebuilder/.project

Lines changed: 0 additions & 11 deletions
This file was deleted.

eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.resources.prefs

Lines changed: 0 additions & 2 deletions
This file was deleted.

eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.runtime.prefs

Lines changed: 0 additions & 2 deletions
This file was deleted.

oomph/Platform.setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@
737737
xsi:type="predicates:AndPredicate">
738738
<operand
739739
xsi:type="predicates:RepositoryPredicate"
740-
project="org.eclipse.platform.releng.tychoeclipsebuilder"/>
740+
project="eclipse.platform.releng.aggregator"/>
741741
<operand
742742
xsi:type="workingsets:ExclusionPredicate"
743743
excludedWorkingSet="//'releng.aggregator.workingsets'/@workingSets[name='Platform%20Documentation'] //'releng.aggregator.workingsets'/@workingSets[name='Platform%20Releng'] //'releng.aggregator.workingsets'/@workingSets[name='Platform%20Releng%20Tests']"/>

eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml renamed to scripts/testing/publishingFiles/testManifest.xml

File renamed without changes.

0 commit comments

Comments
 (0)