From 6ce2ec558ed488abfe22b379aecb44517bc51067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 8 Apr 2025 14:32:04 +0300 Subject: [PATCH] Drop perf tests from ant and php files Reduce the spaghetti there so running and reporting regular tests is streamlined. Part of https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2968 . --- cje-production/scripts/collectTestResults.xml | 11 +- cje-production/scripts/publish.xml | 299 ++---- .../performanceLRTestManifest.xml | 16 - .../performanceTestManifest.xml | 42 - .../staticDropFiles/perflogs.php | 66 -- .../staticDropFiles/performance/FAIL.gif | Bin 73 -> 0 bytes .../performance/FAIL_greyed.gif | Bin 93 -> 0 bytes .../staticDropFiles/performance/OK.gif | Bin 81 -> 0 bytes .../staticDropFiles/performance/ToolTip.css | 35 - .../staticDropFiles/performance/ToolTip.js | 23 - .../staticDropFiles/testResults.php | 18 +- .../templateFiles/basicPerformance.php | 53 - .../templateFiles/index.template.php | 8 - .../templateFiles/performance.php | 111 --- production/README.md | 81 -- .../sdk.tests/testScripts/test.xml | 227 +---- .../configuration/streamSpecific.properties | 11 - production/testScripts/runTests2.xml | 932 ++++++++---------- .../testScripts/updateTestResultsPages.sh | 169 ---- 19 files changed, 545 insertions(+), 1557 deletions(-) delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceLRTestManifest.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceTestManifest.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perflogs.php delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/FAIL.gif delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/FAIL_greyed.gif delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/OK.gif delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/ToolTip.css delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/ToolTip.js delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/basicPerformance.php delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php delete mode 100644 production/README.md diff --git a/cje-production/scripts/collectTestResults.xml b/cje-production/scripts/collectTestResults.xml index 5a1157566a1..ec75dfd61cb 100644 --- a/cje-production/scripts/collectTestResults.xml +++ b/cje-production/scripts/collectTestResults.xml @@ -34,15 +34,8 @@ - - - + diff --git a/cje-production/scripts/publish.xml b/cje-production/scripts/publish.xml index 43d659258b3..ed89d19de0c 100644 --- a/cje-production/scripts/publish.xml +++ b/cje-production/scripts/publish.xml @@ -17,35 +17,33 @@ name="Publish Build" default="generateIndex"> - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + + - - + - + + + + + + + + - - - - - - - - + - + + + + + - - - - - - - - + + - - - - - - + + + + + - - - - - - - - + - - - - + - - - - + + - - - - - - + - - - - - + + - - - + - - - + - - + + - + - - - - + + + + - + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - + diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceLRTestManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceLRTestManifest.xml deleted file mode 100644 index dbed2f4c86d..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceLRTestManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceTestManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceTestManifest.xml deleted file mode 100644 index 652bc95a0cc..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceTestManifest.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perflogs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perflogs.php deleted file mode 100644 index aa29e3256e2..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perflogs.php +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - -Performance Test Logs for <?= $BUILD_ID ?> - - - - - - - - -
-
-

Performance Unit Test Logs for

- -

Console Logs

-

These logs contain the console output captured while running the JUnit automated tests.

- - - -
-
- - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/FAIL.gif b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/FAIL.gif deleted file mode 100644 index c65be5abe7ad5b97f4b7963c7a05ce810c02a03a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73 zcmZ?wbhEHb`Ki5R#Fq;O^-gz@Ye( og^>XWbU*}1BLkDD3sYuQWky`G|IWA^-pY diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/OK.gif b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/OK.gif deleted file mode 100644 index aca6ae4fbf8130a52df38f1464e558f225848f70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmZ?wbhEHbOBKSM#og#Z8lEB<6*WME)s&|v@qkURsE;++0QYsN!8 i)rGuV5>r_Ci|^<5vv#H&s(otM+9M?y?jz62U=0AFT^Dcw diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/ToolTip.css b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/ToolTip.css deleted file mode 100644 index 0814240cc15..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/ToolTip.css +++ /dev/null @@ -1,35 +0,0 @@ -.hidden_tooltip { - display: none; -} - -span.visible_tooltip { - display: block; - position: absolute; - top: 10px; - left: 21px; - width: 300px; - font-size: 9px;; - padding-left: 5px; - padding-right: 5px; - border: 1px solid black; - background-color: #FFFFCC; - text-decoration: none; - color: #000000; - z-index: 10; -} - -a { - text-decoration: none; -} - -span {z-index =100; - -} - -img, table { - z-index: 1; -} - -.tooltipSource { - position: relative; -} \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/ToolTip.js b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/ToolTip.js deleted file mode 100644 index 4b66d98e048..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance/ToolTip.js +++ /dev/null @@ -1,23 +0,0 @@ -// General purpose functions. - -function hide_element(elementId) { - element = document.getElementById(elementId); - if(element != null) { - currentClass = element.className; - if(currentClass =='visible_tooltip') { - element.className = 'hidden_tooltip'; - } - } -} - -function show_element(elementId) { - element = document.getElementById(elementId); - if(element != null) { - currentClass = element.className; - if(currentClass == 'hidden_tooltip') { - element.className = 'visible_tooltip'; - } - } -} - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResults.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResults.php index 182315a6b5f..fefd3a96cdf 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResults.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResults.php @@ -88,26 +88,10 @@ else { echo "
  • No deprecation report. Nothing deprecated since ${API_PREV_REF_LABEL}.
    • "; } -?> - -Zip of .api_filters files used in the build"; -?> -eclipse.platform.releng.aggregator: $BRANCH "; - -?> -\n"; - //$generated=file_exists("performance/global_fp.php"); - if (file_exists("performance/performance.php")) { - echo "View the performance test results for the current build.\n"; - } else { - echo "Performance tests are pending.\n"; - } - echo "\n"; echo "\n"; + ?>
    diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/basicPerformance.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/basicPerformance.php deleted file mode 100644 index bf575c7a846..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/basicPerformance.php +++ /dev/null @@ -1,53 +0,0 @@ -$BUILD_ID
  • TEST RESULTS
  • $COMPONENT_ID RESULTS
    • "; - -require("../DL.thin.header.php.html"); - -echo "

    Performance of $COMPONENT_ID: $BUILD_ID relative to $BASELINE_ID

    "; - -if (file_exists($COMPONENT_ID.'_BasicTable.html')) { - $my_file = file_get_contents($COMPONENT_ID.'_BasicTable.html'); - echo $my_file; -} -else { - echo "Results Pending..."; -} - -?> \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template.php index d3f8d599cc9..16de0a4d123 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template.php @@ -223,14 +223,6 @@ echo "
  • View the integration and unit test results for the current build.
    • \n"; } - /* performance tests line item */ - //$generated=file_exists("performance/global_fp.php"); - if (file_exists("performance/performance.php")) { - echo "
  • View the performance test results for the current build.
    • \n"; - } else { - echo "
  • Performance tests are pending.
    • \n"; - } - echo "\n"; if (file_exists("TEST_INVOCATION_FAILED.html")) { diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php deleted file mode 100644 index 7c12fa10979..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php +++ /dev/null @@ -1,111 +0,0 @@ -$BUILD_ID
  • Test Results
    • "; - -require("../DL.thin.header.php.html"); - -?> - - - - -

    Detailed performance data grouped by scenario prefix

    - - - - - - - - -
    - - - diff --git a/production/README.md b/production/README.md deleted file mode 100644 index b63ee5b29dd..00000000000 --- a/production/README.md +++ /dev/null @@ -1,81 +0,0 @@ -## Performance Tests - -This folder contains files used to run Eclipse Platform Performance tests. Performance tests are run in the [Eclipse Platform Releng](https://ci.eclipse.org/releng/view/Performance%20Tests/) Jenkins instance. - -Results collection is handled by the [collection job](https://ci.eclipse.org/releng/view/Performance%20Tests/job/ep-collectPerfResults/) in Jenkins which runs [collectTestResults.xml](../cje-production/scripts/collectTestResults.xml) - -### Running Performance Tests Locally - -In order to run the performance tests locally: - * Set environment variables for `JOB_NAME`, `WORKSPACE` and `testToRun`. - * `JOB_NAME` can be anything, it's used to generate the names for results files and folders - * `WORKSPACE` is the location where generated files will be placed. - * `testToRun` determines whether to run `selectPerformance` or `otherPerformance` - For Reference: - * `selectPerformance` is used when running the [ep424I-perf-lin64](https://ci.eclipse.org/releng/view/Performance%20Tests/job/ep424I-perf-lin64/) and [ep424I-perf-lin64-baseline](https://ci.eclipse.org/releng/view/Performance%20Tests/job/ep424I-perf-lin64-baseline/) tests. - * `otherPerformance` is used to run [ep424ILR-perf-lin64](https://ci.eclipse.org/releng/view/Performance%20Tests/job/ep424ILR-perf-lin64/) and [ep424ILR-perf-lin64-baseline](https://ci.eclipse.org/releng/view/Performance%20Tests/job/ep424ILR-perf-lin64-baseline/) - * Set `buildId` to the build you want to test - i.e `export buildId=I20220324-0140` or `export buildId=R-4.23-202203080310` etc - * Set `baselinePerf=true` if running the baseline version of the tests. - * Download and source `buildproperties.shsource` for the build. - ``` - curl -o buildproperties.shsource https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource - source buildproperties.shsource - ``` - * Make sure you have the latest testScripts/bootstrap/getEBuilder.xml from this folder. - If you don't want to pull the whole repo: - ``` - curl -o getEBuilder.xml https://download.eclipse.org/eclipse/relengScripts/testScripts/bootstrap/getEBuilder.xml - ``` - * Make sure you have ant installed so you can run the following command: - ``` - ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -DbaselinePerf=${baselinePerf} -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=${testToRun} -Dtest.target=performance - ``` - -The current process uses [getEBuilder.xml](testScripts/bootstrap/getEBuilder.xml) to download the testScripts folder then calls [runTests2.xml](testScripts/runTests2.xml). - -runTests2.xml downloads the installer for the build being tested and the zip of the tests being run, then runs them. - -### Select and Other Performance - -(From the testToRun parameter description in Jenkins, probably needs to be updated) - -``` -Collections: -selectPerformance (a group of tests that complete in about 3 hours) -otherPerformance (a small group of tests that either are not working, or take greater than one hour each). - -Individual Tests Suites, per collection: -selectPerformance: - -antui -compare -coreresources -coreruntime -jdtdebug -jdtui -osgi -pdeui -swt -teamcvs -ua -uiforms -uiperformance -uircp - -otherPerformance: -equinoxp2ui -pdeapitooling -jdtcoreperf -jdttext -jdtuirefactoring -``` -### Performance Results Collection - -After performance tests have run they produce a dat file with the results. These were originally designed to be consumed by a database, but the original database was decommissioned in 2016 and never replaced. - -Results collection now waits for all 4 dat files to have been built and coped to the posting directory by [collectTestResults.xml](../cje-production/scripts/collectTestResults.xml), then uses [BasicResultsTable](https://github.com/eclipse-platform/eclipse.platform.releng/blob/master/bundles/org.eclipse.test.performance/src/org/eclipse/test/performance/BasicResultsTable.java) to parse the information and create the results tables. - -Once the tables have been generated [publish.xml](../cje-production/scripts/publish.xml) is called which prepared and runs the [TestResultsGenerator](https://github.com/eclipse-platform/eclipse.platform.releng.buildtools/blob/master/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java). - -Since the files are stored and processed on the eclipse storage machine you can access the perrformance results from the download site by going to https://download.eclipse.org/eclipse/downloads/drops4/BUILDID/performance/ \ No newline at end of file diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml index ab18d6c868c..1084748d793 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml +++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml @@ -625,12 +625,9 @@ - - - + @@ -671,11 +668,6 @@ - - - @@ -909,21 +901,12 @@ append="true" /> - + - - - + - - - - - - - - + @@ -1148,134 +1118,6 @@ dir="${eclipse-home}" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - trying to find ${testPlugin}_*/test.xml - - - - - - - - - - trying to find ${testPlugin}_*.jar - - - - - - - - - - - trying to find ${testPluginX} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index f0c0880f154..247c94f08ef 100644 --- a/production/testScripts/configuration/streamSpecific.properties +++ b/production/testScripts/configuration/streamSpecific.properties @@ -30,17 +30,6 @@ apiTestsPreviousBaseWin32Filename=obsoleteAndNotUsed apiTestsPreviousRefererenceBaseDLBaseURL=obsoleteAndNotUsed apiTestsPreviousRefererenceWin32Filename=obsoleteAndNotUsed -# the following are not used in unit tests, only performance tests, when the variables -# baselinePerf=true -# are specified. The baselinePerf will often be the same as "previous release", but -# not necessarily, so is not hard coded in assumptions. -baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.35-202502280140 -# NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh -baselinePerfVersion=R-4.35-202502280140 -# TODO: could/should eventually "compute" label, from full version? -baselinePerfVersionLabel=4.35 -baselinePerfBuildId=R-4.35-202502280140 - # We currently set here, but would be better to compute this value # by peeking in the "to be tested" tar file. isMacAppLayout=true diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml index 599f9e9bc9e..bb35c01fa44 100644 --- a/production/testScripts/runTests2.xml +++ b/production/testScripts/runTests2.xml @@ -3,510 +3,455 @@ default="runTests2" basedir="."> - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + - + - - - + - - - - - - + - - - - + - - - - - + - - - - + - - - + + - - - + - - - - + + - - + - - - - - - - - - + - - - - - - + - - - + - - - - + + + - + - - + - + - - - - - - - + + + + - + - - - - - + + - - + + - - - - - + + - - + - + - - - - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - + - - - + - - + + - - - + - - - + + - - + - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + - - + - - - - + + + - - - + + + - - - + - - - - + - + - - + - - - + + + - - + - - - - - - - + + + - - - + + - - - + + + - - - + - - - + + + - - - - + + - + - + - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - + - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - - + - - + - - + - - - - - + + + - - - - - - - - + + + + - - - - + + - - - - - - - - + + + - - - - - - + + + - - - - - - + + + + - - - + + + - - + - - - - - - - - + + + + + + + - - - - + + + - - - - - - + + + + + + + - - - + + - - - - + - - + - - + - - - - + + + - - - - + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh index 4b275c9f2ea..d27dc57f32e 100755 --- a/production/testScripts/updateTestResultsPages.sh +++ b/production/testScripts/updateTestResultsPages.sh @@ -184,172 +184,3 @@ else RC=1 exit $RC fi - -#fi - -perfJobPattern="^.*-perf-.*$" -perfBaselineJobPattern="^.*-perf-.*-baseline.*$" - -if [[ $JOB_NAME =~ $perfJobPattern && ! $JOB_NAME =~ $perfBaselineJobPattern ]] -then - # We run the "performance analysis" tools only on "current" build, for jobs that contain -perf- (and do not contain -baseline) - - devArgs="-Xmx512m" - - - echo "Collected a performance run result. Doing performance analysis for $JOB_NAME" - echo - echo " dev script: $0" - echo " buildRoot: $buildRoot" - echo " BUILD_HOME: ${BUILD_HOME}" - echo " pathToDL: $pathToDL" - echo " siteDir: $siteDir" - echo " fromDir: $fromDir" - echo " devworkspace: $devworkspace" - echo " devArgs: $devArgs" - echo " devJRE: $devJRE" - echo " JOB_NAME: $JOB_NAME" - echo " JOB_NUMBER: $JOB_NUMBER" - echo - echo " perfrepoLocation: $perfrepoLocation" - - echo " = = Now run performance.ui app = =" - devworkspace="${fromDir}/workspace-updatePerfResults" - eclipse_perf_dbloc_value=${eclipse_perf_dbloc_value:-/shared/eclipse} - vmargs="-Xmx1G -Declipse.perf.dbloc=${eclipse_perf_dbloc_value}" - postingDirectory=$fromDir - perfOutput=$postingDirectory/performance - # assuming for now the intent is that 'data' is meant to accumulate in common location - # common location doesn't seem to work, with our multi-run method. So, will - # make unique, for now. (Might work ok, if we just had "short set" and "long set" locations? - ROOT_PERF_DATA=/shared/eclipse/perfdataDir - - # experiment with deleting previous .dat files, and regenerate all that are needed. - # (I believe they are a "performance improvement" for the test analysis itself, but - # I suspect they make a lot of assumptions that are no longer true. - rm -fr ${ROOT_PERF_DATA} - RC=$? - if [[ $RC != 0 ]] - then - echo "Could not remove ${ROOT_PERF_DATA}. Return code was $RC. Exiting." - exit $RC - fi - # re-create - mkdir -p ${ROOT_PERF_DATA} - RC=$? - if [[ $RC != 0 ]] - then - echo "Could not mkdir -p ${ROOT_PERF_DATA}. Return code was $RC. Exiting." - exit $RC - fi - # Will try "just one". Might get some better results, now that bug 481272 has been fixed. - dataDir=${ROOT_PERF_DATA} - # dataDir=${ROOT_PERF_DATA}/${buildId}_${JOB_NAME}_${JOB_NUMBER} - # make anew - # mkdir -p "${dataDir}" - # RC=$? - # if [[ $RC != 0 ]] - # then - # echo "Could not mkdir -p $dataDir. Return code was $RC. Exiting." - # exit $RC - # fi - - # The performance UI function needs a DISPLAY to function, so we'll give it one via xvfb - # if running on Hudson, be sure "use xvnc" is checked. - # If not running on Hudson, can use this xvfb-run utility, - # distributed with xvfb as a "build time only" requirement. - echo -e "\n\t[DEBUG] RUNNING_ON_HUDSON: ${RUNNING_ON_HUDSON}\n" - if [[ "${RUNNING_ON_HUDSON}" == "false" ]] - then - XVFB_RUN="xvfb-run" - if [[ ! -w "${TMP_DIR}" ]] - then - echo -e "\n\tTMP_DIR not defined, so will create at ${buildRoot}/tmp" - TMP_DIR="${buildRoot}/tmp" - mkdir -p "${TMP_DIR}" - fi - XVFB_RUN_ARGS="--error-file ${TMP_DIR}/xvfbErrorFile.txt" - # --server-args -screen 0 1024x768x24" - else - echo -e "\n\t[INFO] Running on Hudson, be sure Xvnc is checked." - fi - # - if [[ ${buildType} =~ [INM] ]] - then - if [[ "${buildType}" == "M" ]] - then - current_prefix=" -current.prefix M " - else - current_prefix=" -current.prefix I,N " - fi - else - echo -e "\n\tPROGRAM ERROR: build type did not equal expected value (M or N or I). Exiting." - exit 1 - fi - - #PERF_OUTFILE="${fromDir}/performance/perfAnalysis_${buildId}_${JOB_NAME}_${JOB_NUMBER}.txt" - echo "Beginning performance analysis. - #Results in ${PERF_OUTFILE}." - mkdir -p "${fromDir}/performance" - RAW_DATE_START=$( date -u +%s ) - - # TODO: avoid this hard coding of baseline value - # NOTE: value must start with a letter match baselinePerfVersion in testScripts/configuration/streamSpecific.properties - baselineCode="R-4.35-202502280140" - # to get time stamp, first remove initial IMN: - baselineForBuildSuffix=${buildId/[IMN]/} - #Then remove final '-' in build id - baselineForBuildSuffix=${baselineForBuildSuffix/-/} - # then form "final" baseline code with true base line with -timestamp - baselineForCurrent="${baselineCode}-${baselineForBuildSuffix}" - - #echo -e "\n\tDEBUG RAW Date Start: ${RAW_DATE_START} \n" - echo -e "\n\tStart Time: $( date +%Y%m%d%H%M%S -d @${RAW_DATE_START} ) \n" #>${PERF_OUTFILE} - echo " = = Properties in updateTestResultsPages.sh: performance.ui.resultGenerator section = = " ##>>${PERF_OUTFILE} - echo " dev script: $0" #>>${PERF_OUTFILE} - echo - echo " buildId: $buildId" - echo " baselineCode: ${baselineCode}" - echo " baselineForCurrent: ${baselineForCurrent}" - echo - echo " buildRoot: $buildRoot" #>>${PERF_OUTFILE} - echo " BUILD_HOME: ${BUILD_HOME}" #>>${PERF_OUTFILE} - echo " pathToDL: $pathToDL" #>>${PERF_OUTFILE} - echo " siteDir: $siteDir" #>>${PERF_OUTFILE} - echo " fromDir: $fromDir" #>>${PERF_OUTFILE} - echo " devworkspace: $devworkspace" #>>${PERF_OUTFILE} - echo " vmargs: $vmargs" #>>${PERF_OUTFILE} - echo " devJRE: $devJRE" #>>${PERF_OUTFILE} - echo " BUILDFILESTR: $BUILDFILESTR" #>> ${PERF_OUTFILE} - echo " JOB_NAME: $JOB_NAME" #>> ${PERF_OUTFILE} - echo " JOB_NUMBER: $JOB_NUMBER" #>> ${PERF_OUTFILE} - echo " XVFB_RUN_ARGS $XVFB_RUN_ARGS" #>> ${PERF_OUTFILE} - echo " current_prefix ${current_prefix}" #>> ${PERF_OUTFILE} - echo #>> ${PERF_OUTFILE} - - ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.test.performance.ui.importPerformanceData $perfOutput/*-perf-samples.dat -vm ${devJRE} -vmargs ${vmargs} - RC=$? - if [[ $RC != 0 ]] - then - echo "ERROR: eclipse returned non-zero return code from invoking performance data import, exiting with RC: $RC." - exit $RC - fi - - ${XVFB_RUN} ${XVFB_RUN_ARGS} ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.test.performance.ui.resultGenerator -baseline ${baselineForCurrent} -current ${buildId} -jvm 8.0 -config linux.gtk.x86_64 -config.properties "linux.gtk.x86_64,SUSE Linux Enterprise Server 12 (x86_64)" -output $perfOutput -dataDir ${dataDir} ${current_prefix} -print -vm ${devJRE} -vmargs ${vmargs} #>> ${PERF_OUTFILE} - RC=$? - if [[ $RC != 0 ]] - then - echo "ERROR: eclipse returned non-zero return code from invoking performance.ui app, exiting with RC: $RC." - exit $RC - fi - RAW_DATE_END=$( date -u +%s ) - - #echo -e "\n\tRAW Date End: ${RAW_DATE_END} \n" - echo -e "\n\tEnd Time: $( date +%Y%m%d%H%M%S -d @${RAW_DATE_END} )" #>> ${PERF_OUTFILE} - - ELAPSED_SECONDS=$(( ${RAW_DATE_END} - ${RAW_DATE_START} )) - # echo -e "\n\tDEBUG: RAW_DATE_END: ${RAW_DATE_END} RAW_DATE_START ${RAW_DATE_START} ELAPSED_SECONDS ${ELAPSED_SECONDS}" #>> ${PERF_OUTFILE} - ELAPSED_TIME=$( show_time ${ELAPSED_SECONDS} ) - echo -e "\n\tElapsed Time: ${ELAPSED_TIME}" #>> ${PERF_OUTFILE} -fi -