Skip to content

Commit eed4435

Browse files
HannesWellHannesWell
committed
Rename tests.html page to reports.html in build website
The page previously named tests.html reports test results and compiler issues and lists multiple other reports.
1 parent 1f49a25 commit eed4435

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

‎JenkinsJobs/Builds/build.jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ pipeline {
656656
https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}
657657

658658
Build logs and/or test results (eventually):
659-
https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/tests.html
659+
https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/reports.html#tests
660660
""" + (env.COMPARATOR_ERRORS_SUBJECT == '' ? '' : """
661661
Check unanticipated comparator messages:
662662
https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt

‎JenkinsJobs/Releng/updateIndex.jenkinsfile‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,15 @@ pipeline {
5252
find \${drop}/testresults -maxdepth 1 -type f -name "ep*-unit-*.json" ! -name "ep*-unit-*-summary.json" | wc -l
5353
# Count number of old-style test-result overview files (still relevant for not yet archived releases)
5454
find \${drop}/testresults -maxdepth 1 -type f -name "ep*-unit-*.xml" | wc -l
55-
if [ -f \${drop}/index.html ]; then
56-
echo "style-new"
55+
#TODO: Remove this after the next three release when there are no old old-style tests on the overview page anymore
56+
if [ -f \${drop}/reports.html ]; then
57+
echo 'reports.html#tests'
58+
elif [ -f \${drop}/tests.html ]; then
59+
echo 'tests.html'
60+
elif [ -f \${drop}/testResults.php ]; then
61+
echo 'testResults.php'
5762
else
58-
echo "style-old"
63+
echo 'unknown'
5964
fi
6065
if [ -f \${drop}/buildUnstable ]; then
6166
echo "unstable"
@@ -113,11 +118,10 @@ def parseEclipseBuildDrops(String buildDrops) {
113118
def int testsExpected = Integer.parseInt(dropDataElements[1])
114119
def int testsFinishedNew = Integer.parseInt(dropDataElements[2])
115120
def int testsFinishedOld = Integer.parseInt(dropDataElements[3])
116-
def boolean isNewStyleDrop = dropDataElements[4] == 'style-new'
117121
def boolean isUnstable = dropDataElements.length > 5 && dropDataElements[5] == 'unstable'
118122
def drop = createDropEntry(dropID, 'drops4', isUnstable, overview)
119123
drop.testsCompletion = "${ testsFinishedNew + testsFinishedOld } of ${testsExpected}".toString()
120-
drop.testsPath = isNewStyleDrop ? 'tests.html' : 'testResults.php'
124+
drop.testsPath = dropDataElements[4]
121125
}
122126
overview.values().each{ list -> list.sort({d1, d2 -> -d1.label.compareTo(d2.label)})}
123127
return overview

‎sites/eclipse/build/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ <h2>Eclipse <span class="data-ref">${release}</span> <span class="data-ref">${bu
3535

3636
<h3>Logs and Test Links</h3>
3737
<ul>
38-
<li>View the <a href="tests.html">logs for the current build</a>.</li>
39-
<li>View the <a href="tests.html">integration and unit test results for the current build.</a>.</li>
38+
<li>View the <a href="reports.html#logs">logs for the current build</a>.</li>
39+
<li>View the <a href="reports.html#tests">integration and unit test results for the current build.</a>.</li>
4040
</ul>
4141

4242
<h3 id="tests">Summary of Unit Test Results</h3>
@@ -145,7 +145,7 @@ <h3 id="swt">SWT Binary and Source
145145
const result = testResults[r]
146146
const testName = build.expectedTests[r]
147147
//TODO: compute nicer, non-breaking label (like for file Platforms?) and align elements horizontally
148-
const label = `<a href="tests.html">${testName}</a>`
148+
const label = `<a href="reports.html#tests">${testName}</a>`
149149
if (result.duration) { // Test configuration completed
150150
completedTests++
151151
row.innerHTML = `

sites/eclipse/build/tests.html renamed to sites/eclipse/build/reports.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<head>
55
<!--TODO: set proper metadata/keywords? -->
6-
<title>Test Results</title>
6+
<title>Reports</title>
77
<meta name="keywords" content="eclipse,project,plug-ins,plugins,java,ide,swt,refactoring,free java ide,tools,platform,open source,development environment,development,ide" />
88
<link rel="preconnect stylesheet" href="../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
99
<script src="../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
@@ -13,11 +13,11 @@
1313
<div data-generate="generateDefaultBreadcrumb(this, eclipseBreadcrumbBase)">
1414
<a href="../..">Downloads</a>
1515
<a class="data-ref" href=".">${label}</a>
16-
<span>Test Results</span>
16+
<span>Reports</span>
1717
</div>
1818

1919
<main>
20-
<h2>Test Results for <a class="data-ref" href=".">${label}</a></h2>
20+
<h2>Reports for <span class="data-ref">${label}</span></h2>
2121
<h3 id="logs">Logs</h3>
2222
<ul class="data-ref">
2323
<li><a href="buildlogs/reporeports/index.html"><b>Repository Reports </b></a></li>
@@ -30,7 +30,7 @@ <h3 id="logs">Logs</h3>
3030
<li><a href="apitools/deprecation/apideprecation.html"><b>API Tools Deprecation Report</b></a> This tool generates a report for API deprecated since ${previousReleaseAPILabel}.</li>
3131
<li><a href="apitools/apifilters-${label}.zip"><b>Zip of <samp>.api_filters</samp> files used in the build</b></a></li>
3232
</ul>
33-
<h3 id="test-results">Unit Test Results</h3>
33+
<h3 id="tests">Unit Test Results</h3>
3434
<p>The unit tests are run on the <a id="ci-tests-folder-url" href="https://ci.eclipse.org/releng">RelEng Jenkins instance</a>.</p>
3535
<p>
3636
The table shows the unit test results for this build on the platforms tested.

0 commit comments

Comments
 (0)