Skip to content

Drop perf tests from ant and php files #2978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akurtakov merged 1 commit into from
Apr 8, 2025
Merged

Drop perf tests from ant and php files #2978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions cje-production/scripts/collectTestResults.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,8 @@
<echo message="postingDirectory: ${postingDirectory}"/>


<condition
property="resultsDir"
value="${postingDirectory}/${buildID}/performance"
else="${postingDirectory}/${buildID}/testresults">
<contains
string="${jenkinsJobURL}"
substring="-perf-"
casesensitive="yes" />
</condition>
<property name="resultsDir"
value="${postingDirectory}/${buildID}/testresults"/>

<!-- attempt to create incase hasn't been created yet -->
<mkdir dir="${resultsDir}" />
Expand Down
299 changes: 99 additions & 200 deletions cje-production/scripts/publish.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,33 @@
name="Publish Build"
default="generateIndex">

<target name="generateIndex"
<target name="generateIndex"
depends="initResultsVariables">

<property
<property
name="class"
value="org.eclipse.releng.generators.TestResultsGenerator" />
<taskdef
name="indexResults"
classname="${class}" />

<echo message=" = = properties in publish.xml == " />
<echo message=" job: ${job}" />
<echo message=" isBuildTested: ${isBuildTested}" />
<echo message=" buildType: ${buildType}" />
<echo message=" dropTokenList: ${dropTokenList}" />
<echo message=" indexFileName: ${indexFileName}" />
<echo message=" xmlDirectoryName: ${xmlDirectoryName}" />
<echo message=" dropDirectoryName: ${buildDirectory}" />
<echo message=" dropTemplateFileName: ${dropTemplateFileName}" />
<echo message=" testResultsHtmlFileName: ${testResultsHtmlFileName}" />
<echo message=" hrefTestResultsTargetPath: ${hrefTestResultsTargetPath}" />
<echo message=" hrefCompileLogsTargetPath: ${hrefCompileLogsTargetPath}" />
<echo message=" compileLogsDirectoryName: ${compileLogsDirectoryName}" />
<echo message=" testManifestFileName: ${manifestFile}" />
<echo message=" testsConfigExpected: ${testsConfigExpected}" />
<echo message=" expectedConfigFilename: ${expectedConfigFilename}" />
<echo message=" foundConfigFilename: ${foundConfigFilename}" />
<echo message=" doMissingListValue: ${doMissingListValue}" />
<indexResults
<taskdef name="indexResults" classname="${class}" />

<echo message=" = = properties in publish.xml == " />
<echo message=" job: ${job}" />
<echo message=" isBuildTested: ${isBuildTested}" />
<echo message=" buildType: ${buildType}" />
<echo message=" dropTokenList: ${dropTokenList}" />
<echo message=" indexFileName: ${indexFileName}" />
<echo message=" xmlDirectoryName: ${xmlDirectoryName}" />
<echo message=" dropDirectoryName: ${buildDirectory}" />
<echo message=" dropTemplateFileName: ${dropTemplateFileName}" />
<echo message=" testResultsHtmlFileName: ${testResultsHtmlFileName}" />
<echo message=" hrefTestResultsTargetPath: ${hrefTestResultsTargetPath}" />
<echo message=" hrefCompileLogsTargetPath: ${hrefCompileLogsTargetPath}" />
<echo message=" compileLogsDirectoryName: ${compileLogsDirectoryName}" />
<echo message=" testManifestFileName: ${manifestFile}" />
<echo message=" testsConfigExpected: ${testsConfigExpected}" />
<echo message=" expectedConfigFilename: ${expectedConfigFilename}" />
<echo message=" foundConfigFilename: ${foundConfigFilename}" />
<echo message=" doMissingListValue: ${doMissingListValue}" />
<indexResults
isBuildTested="${isBuildTested}"
buildType="${buildType}"
dropTokenList="${dropTokenList}"
Expand All @@ -62,203 +60,104 @@
expectedConfigFilename="${expectedConfigFilename}"
foundConfigFilename="${foundConfigFilename}"
doMissingList="${doMissingListValue}" />
</target>
</target>

<target name="initResultsVariables" depends="init">
<fail unless="job" />

<target name="initResultsVariables"
depends="init">
<fail unless="job" />
<property name="isBuildTested" value="true" />

<property
name="isBuildTested"
value="true" />
<loadresource property="buildType">
<string value="${buildID}"/>
<filterchain>
<tokenfilter>
<replaceregex pattern="^([IMXYNPSRU])(\d{8})-(\d{4})$" replace="\1"/>
</tokenfilter>
</filterchain>
</loadresource>

<loadresource property="buildType">
<string value="${buildID}"/>
<filterchain>
<tokenfilter>
<replaceregex pattern="^([IMXYNPSRU])(\d{8})-(\d{4})$" replace="\1"/>
</tokenfilter>
</filterchain>
</loadresource>
<property name="dropTokenList" value="%repository%,%sdk%,%tests%,%runtime%,%jdtc%,%swt%" />

<property
name="dropTokenList"
value="%repository%,%sdk%,%tests%,%runtime%,%jdtc%,%swt%" />
<condition property="indexFileName" value="testResults.php">
<contains string="${job}" substring="-unit-" />
</condition>
<!-- else standard default for download page -->
<property name="indexFileName" value="index.php" />

<condition
property="indexFileName"
value="performance/performance.php">
<contains
string="${job}"
substring="-perf-" />
</condition>
<condition
property="indexFileName"
value="testResults.php">
<contains
string="${job}"
substring="-unit-" />
</condition>
<!-- else standard default for download page -->
<property
name="indexFileName"
value="index.php" />
<!-- xml results directory -->
<property name="xmlDirectoryName" value="${buildDirectory}/testresults/xml" />

<!-- xml results directory -->
<condition
property="xmlDirectoryName"
value="${buildDirectory}/performance/xml">
<contains
string="${job}"
substring="-perf-" />
</condition>
<!-- else standard default for unit tests -->
<property
name="xmlDirectoryName"
value="${buildDirectory}/testresults/xml" />
<condition property="dropTemplateFileName" value="${EBuilderDir}/eclipse/publishingFiles/staticDropFiles/testResults.php">
<contains string="${job}" substring="-unit-" />
</condition>
<!-- else standard default for download index.php page -->
<property name="dropTemplateFileName" value="${EBuilderDir}/eclipse/publishingFiles/templateFiles/index.template.php" />

<condition
property="dropTemplateFileName"
value="${EBuilderDir}/eclipse/publishingFiles/templateFiles/performance.php">
<contains
string="${job}"
substring="-perf-" />
</condition>
<condition
property="dropTemplateFileName"
value="${EBuilderDir}/eclipse/publishingFiles/staticDropFiles/testResults.php">
<contains
string="${job}"
substring="-unit-" />
</condition>
<!-- else standard default for download index.php page -->
<property
name="dropTemplateFileName"
value="${EBuilderDir}/eclipse/publishingFiles/templateFiles/index.template.php" />
<property name="testResultsHtmlFileName" value="testResultsTables.html" />

<condition
property="testResultsHtmlFileName"
value="performanceResultsTable.html">
<contains
string="${job}"
substring="-perf-" />
</condition>
<property
name="testResultsHtmlFileName"
value="testResultsTables.html" />
<property name="hrefTestResultsTargetPath" value="testresults" />

<condition
property="hrefTestResultsTargetPath"
value=".">
<contains
string="${job}"
substring="-perf-" />
</condition>
<property
name="hrefTestResultsTargetPath"
value="testresults" />
<property name="hrefCompileLogsTargetPath" value="compilelogs/plugins/" />
<property name="compileLogsDirectoryName" value="${buildDirectory}/${hrefCompileLogsTargetPath}" />

<property
name="hrefCompileLogsTargetPath"
value="compilelogs/plugins/" />
<property
name="compileLogsDirectoryName"
value="${buildDirectory}/${hrefCompileLogsTargetPath}" />

<condition
property="manifestFile"
value="${EBuilderDir}/eclipse/publishingFiles/performanceTestManifest.xml"
else="${EBuilderDir}/eclipse/publishingFiles/testManifest.xml">
<contains
string="${job}"
substring="-perf-" />
</condition>
<property name="manifestFile" value="${EBuilderDir}/eclipse/publishingFiles/testManifest.xml" />

<condition
property="testsConfigExpected"
value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-perf-lin64_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-perf-lin64-baseline_linux.gtk.x86_64_11">
<contains
string="${job}"
substring="-perf-" />
</condition>
<!-- else normal unit tests configs -->
<property name="testsConfigExpected" value="${env.TEST_CONFIGURATIONS_EXPECTED}"/>
<!-- normal unit tests configs -->
<property name="testsConfigExpected" value="${env.TEST_CONFIGURATIONS_EXPECTED}" />

<condition
property="expectedConfigFilename"
value="perfTestConfigs.php"
else="testConfigs.php">
<contains
string="${job}"
substring="-perf-" />
</condition>
<property name="expectedConfigFilename" value="testConfigs.php" />

<condition
property="foundConfigFilename"
value="perfTestConfigsFound.php"
else="testConfigsFound.php">
<contains
string="${job}"
substring="-perf-" />
</condition>
<property name="foundConfigFilename" value="testConfigsFound.php" />

<!-- we should be able to do this now, and refine list in manifest. -->
<property
name="doMissingListValue"
value="true" />
<!-- we should be able to do this now, and refine list in manifest. -->
<property name="doMissingListValue" value="true" />

</target>
</target>

<target name="init">
<fail unless="buildID" />
<fail unless="eclipseStream" />
<fail unless="postingDirectory" />
<target name="init">
<fail unless="buildID" />
<fail unless="eclipseStream" />
<fail unless="postingDirectory" />

<property
name="buildDirectory"
value="${postingDirectory}/${buildID}" />
<property name="buildDirectory" value="${postingDirectory}/${buildID}" />

<condition property="streamOK">
<matches
pattern="\d+\.\d+\.\d+"
string="${eclipseStream}" />
</condition>
<fail
message="eclipseStream variable had unexpected format. Should be digit.digit.digit, but was ${eclipseStream}"
unless="streamOK" />
<condition property="streamOK">
<matches pattern="\d+\.\d+\.\d+" string="${eclipseStream}" />
</condition>
<fail message="eclipseStream variable had unexpected format. Should be digit.digit.digit, but was ${eclipseStream}" unless="streamOK" />

<loadresource property="eclipseStreamMajor">
<string value="${eclipseStream}"/>
<filterchain>
<tokenfilter>
<replaceregex pattern="^(\d+)\.(\d+)(\.(\d+))" replace="\1"/>
</tokenfilter>
</filterchain>
</loadresource>
<echo message="eclipseStreamMajor: ${eclipseStreamMajor}"/>
<loadresource property="eclipseStreamMajor">
<string value="${eclipseStream}"/>
<filterchain>
<tokenfilter>
<replaceregex pattern="^(\d+)\.(\d+)(\.(\d+))" replace="\1"/>
</tokenfilter>
</filterchain>
</loadresource>
<echo message="eclipseStreamMajor: ${eclipseStreamMajor}"/>

<loadresource property="eclipseStreamMinor">
<string value="${eclipseStream}"/>
<filterchain>
<tokenfilter>
<replaceregex pattern="^(\d+)\.(\d+)(\.(\d+))" replace="\2"/>
</tokenfilter>
</filterchain>
</loadresource>
<echo message="eclipseStreamMinor: ${eclipseStreamMinor}"/>
<loadresource property="eclipseStreamMinor">
<string value="${eclipseStream}"/>
<filterchain>
<tokenfilter>
<replaceregex pattern="^(\d+)\.(\d+)(\.(\d+))" replace="\2"/>
</tokenfilter>
</filterchain>
</loadresource>
<echo message="eclipseStreamMinor: ${eclipseStreamMinor}"/>

<loadresource property="eclipseStreamService">
<string value="${eclipseStream}"/>
<filterchain>
<tokenfilter>
<replaceregex pattern="^(\d+)\.(\d+)(\.(\d+))" replace="\3"/>
</tokenfilter>
</filterchain>
</loadresource>
<echo message="eclipseStreamService: ${eclipseStreamService}"/>
<loadresource property="eclipseStreamService">
<string value="${eclipseStream}"/>
<filterchain>
<tokenfilter>
<replaceregex pattern="^(\d+)\.(\d+)(\.(\d+))" replace="\3"/>
</tokenfilter>
</filterchain>
</loadresource>
<echo message="eclipseStreamService: ${eclipseStreamService}"/>

<property environment="env"/>
<property environment="env"/>

</target>
</target>

</project>
16 changes: 0 additions & 16 deletions ...platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceLRTestManifest.xml
View file
Open in desktop

This file was deleted.

Loading