Skip to content

Commit 92acef8

Browse files
HannesWellHannesWell
committed
Streamline and clean-up overview section of build websites
- Rearrange sections, improve labels and remove unnecessary text - Beautify TOC styling - Unify and improve display of runtimes - Drop repo image - Unify styling of lists
1 parent 1e6cbde commit 92acef8

File tree

16 files changed

+142
-131
lines changed

16 files changed

+142
-131
lines changed

‎JenkinsJobs/Builds/build.jenkinsfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ pipeline {
452452
sh '''#!/bin/bash -xe
453453
dropDir=${DROP_DIR}/${BUILD_ID}
454454
if [ -n "${COMPARATOR_ERRORS_SUBJECT}" ]; then
455-
echo "<p>This build has been marked unstable due to <a href='https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt'>unanticipated comparator errors</a></p>" > ${dropDir}/buildUnstable
455+
echo "This build has been marked unstable due to <a href='buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt'>unanticipated comparator errors</a>." > ${dropDir}/buildUnstable
456456
fi
457457
scp -r ${dropDir} genie.releng@projects-storage.eclipse.org:${EP_ECLIPSE_DROPS}/.
458458
'''
@@ -542,7 +542,7 @@ pipeline {
542542
sh '''#!/bin/bash -xe
543543
dropDir=${EQUINOX_DROP_DIR}/${BUILD_ID}
544544
if [ -n "${COMPARATOR_ERRORS_SUBJECT}" ]; then
545-
echo "<p>This build has been marked unstable due to <a href='https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt'>unanticipated comparator errors</a></p>" > ${dropDir}/buildUnstable
545+
echo "This build has been marked unstable due to <a href='https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt'>unanticipated comparator errors</a>." > ${dropDir}/buildUnstable
546546
fi
547547
scp -r ${dropDir} genie.releng@projects-storage.eclipse.org:${EP_EQUINOX_DROPS}/.
548548
'''
@@ -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}/reports.html#tests
659+
https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/reports.html
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/Builds/markBuild.jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pipeline {
4646
# Convert URL of GH issue or PR into: 'organization/repository#number'
4747
label=$(echo "${issueURL##'https://github.com/'}" | sed 's/\\/issues\\//#/g' | sed 's/\\/pull\\//#/g')
4848
#Add unstable tag
49-
echo "<p>This build is marked unstable due to <a href='${issueURL}'>${label}</a>.</p>" > buildUnstable
49+
echo "This build is marked unstable due to <a href='${issueURL}'>${label}</a>." > buildUnstable
5050
scp buildUnstable genie.releng@projects-storage.eclipse.org:${EP_BUILD_DROP}/buildUnstable
5151
;;
5252
RETAINED_INDEFINITELY)

‎scripts/releng/BuildDropDataGenerator.java‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void mainEclipsePageData() throws IOException {
7878

7979
// files
8080
buildProperties.add("p2Repository", JSON.Array.create(//
81-
createFileEntry("repository-" + buildId + ".zip", files, "All", "repo.gif")));
81+
createFileEntry("repository-" + buildId + ".zip", files, "All")));
8282

8383
buildProperties.add("sdkProducts",
8484
collectFileEntries(files, filename -> filename.startsWith("eclipse-SDK-") && !OS.isMacTarGZ(filename)));
@@ -89,7 +89,7 @@ void mainEclipsePageData() throws IOException {
8989
JSON.Array platformProducts = collectFileEntries(files,
9090
filename -> filename.startsWith("eclipse-platform-") && !OS.isMacTarGZ(filename));
9191
platformProducts.add(createFileEntry( // Add separate entry for eclipse-platform product p2-repository
92-
"org.eclipse.platform-" + buildId + ".zip", files, "Platform Runtime Repo", "repo.gif"));
92+
"org.eclipse.platform-" + buildId + ".zip", files, "Platform Runtime Repo"));
9393
buildProperties.add("platformProducts", platformProducts);
9494

9595
buildProperties.add("jdtCompiler", JSON.Array.create( //
@@ -200,22 +200,12 @@ JSON.Array colleFilesInDirectory(Path inDirectory, Predicate<String> filenameFil
200200
return 100;
201201
})).thenComparing(Comparator.naturalOrder());
202202

203-
JSON.Object createFileEntry(String filename, Map<Path, Long> buildFiles, String platform, String icon) {
204-
return createFileEntry(Path.of(filename), buildFiles, platform, icon);
205-
}
206-
207203
JSON.Object createFileEntry(String filename, Map<Path, Long> buildFiles, String platform) {
208-
return createFileEntry(Path.of(filename), buildFiles, platform, null);
209-
}
210-
211-
JSON.Object createFileEntry(Path filename, Map<Path, Long> buildFiles, String platform, String icon) {
212-
JSON.Object file = createFileDescription(filename, buildFiles.get(filename));
204+
Path filePath = Path.of(filename);
205+
JSON.Object file = createFileDescription(filePath, buildFiles.get(filePath));
213206
if (platform != null) {
214207
file.add("platform", JSON.String.create(platform));
215208
}
216-
if (icon != null) {
217-
file.add("icon", JSON.String.create(icon));
218-
}
219209
return file;
220210
}
221211

‎sites/.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
eclipse/**/*.json
2+
equinox/**/*.json
3+
eclipse/build/compilelogs/**/*.xml
4+
5+
eclipse/build/buildUnstable
6+
equinox/build/buildUnstable

‎sites/eclipse/.gitignore‎

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

‎sites/eclipse/build/buildlogs/logs.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ <h3 id="properties">Build Properties</h3>
2525
</ul>
2626

2727
<h3 id="build">Build logs</h3>
28-
<ul id="build-logs" style="list-style-type:square;">
28+
<ul id="build-logs">
2929
</ul>
3030

3131
<h3 id="comparator">Comparator Logs</h3>
3232
<p>For explaination, see <a href="https://wiki.eclipse.org/Platform-releng/Platform_Build_Comparator_Logs">Platform Build Comparator Logs</a> wiki.</p>
33-
<ul id="comparator-logs" style="list-style-type:square;">
33+
<ul id="comparator-logs">
3434
</ul>
3535
<p>For an archive of all relevant baseline-versus-current build artifact byte codes download and 'diff' matching files of
3636
<a href="comparatorlogs/artifactcomparisons.zip">artifact comparisons</a>.

‎sites/eclipse/build/index.html‎

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,48 +18,46 @@
1818
<main>
1919

2020
<h2>Eclipse <span class="data-ref">${release}</span> <span class="data-ref">${buildTypeName}</span> Build: <span class="data-ref">${label}</span></h2>
21-
<p id="build-state-container"></p>
21+
22+
<div id="build-state-container"></div>
23+
2224
<p>
2325
This page provides access to the various deliverables of Eclipse Platform build along with its logs and tests.
2426
</p>
25-
<p>
26-
<a class="data-ref" href="https://eclipse.dev/eclipse/news/${releaseShort}">New and Noteworthy</a>
27-
<br />
28-
<a class="data-ref" href="https://eclipse.dev/eclipse/markdown/?f=news/${releaseShort}/acknowledgements.md">Acknowledgments</a>
29-
<br />
30-
<a class="data-ref" href="https://eclipse.dev/eclipse/development/readme.html?file=readme_eclipse_${releaseShort}.html">Eclipse Project ${releaseShort} Readme</a>
31-
<br />
32-
<a class="data-ref" href="https://eclipse.dev/eclipse/development/plans.html?file=plans/eclipse_project_plan_${releaseShort}.xml">Eclipse Project Plan</a>
33-
<br />
34-
</p>
35-
36-
<h3>Logs and Test Links</h3>
3727
<ul>
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>
28+
<li><a class="data-ref" href="https://eclipse.dev/eclipse/news/${releaseShort}">New and Noteworthy</a></li>
29+
<li><a class="data-ref" href="https://eclipse.dev/eclipse/markdown/?f=news/${releaseShort}/acknowledgements.md">Acknowledgments</a></li>
30+
<li><a class="data-ref" href="https://eclipse.dev/eclipse/development/readme.html?file=readme_eclipse_${releaseShort}.html">Eclipse Project ${releaseShort} Readme</a></li>
31+
<li><a class="data-ref" href="https://eclipse.dev/eclipse/development/plans.html?file=plans/eclipse_project_plan_${releaseShort}.xml">Eclipse Project Plan</a></li>
32+
<li><a class="data-ref" href="https://eclipse.dev/eclipse/development/plans/eclipse_project_plan_${releaseShort}.xml#target_environments">Target Platforms and Environments</a></li>
4033
</ul>
4134

42-
<h3 id="tests">Summary of Unit Test Results</h3>
35+
<h3 id="reports">Reports</h3>
4336
<p>
44-
<span id="test-completion-state">No</span> integration and unit test configurations are complete.
37+
The <a href="reports.html">Reports page</a> provides detailed build and tests logs and analyses of various aspects of this build.
4538
</p>
39+
40+
<h4 id="tests">Test Results Summary</h4>
4641
<p id="signOff-issue-container"></p>
4742
<table id="tests-overview-table">
4843
<thead>
4944
<tr>
50-
<th style="text-align:center; width:25%">Tested Platform</th>
51-
<th style="text-align:center">Failed</th>
52-
<th style="text-align:center">Passed</th>
53-
<th style="text-align:center">Total</th>
54-
<th style="text-align:center">Runtime</th>
45+
<th style="text-align:center; width:30%">Tested Platform</th>
46+
<th style="text-align:end">Failed</th>
47+
<th style="text-align:end">Passed</th>
48+
<th style="text-align:end">Total</th>
49+
<th style="text-align:end">Runtime</th>
5550
</tr>
5651
</thead>
5752
</table>
5853

59-
<h3>Related Links</h3>
54+
<h4 id="git-log">Git Log</h4>
6055
<ul>
61-
<li><a class="data-ref" href="https://eclipse.dev/eclipse/development/plans/eclipse_project_plan_${releaseShort}.xml#target_environments">Target Platforms and Environments</a></li>
6256
<li><a href="gitLog.html">Git log</a></li>
57+
</ul>
58+
59+
<h4 id="signatures">Checksums&nbsp;(SHA 512) and GPG&nbsp;Signatures</h4>
60+
<ul>
6361
<li><a href="https://wiki.eclipse.org/Platform-releng/How_to_check_integrity_of_downloads">How to verify a download</a></li>
6462
</ul>
6563
<p class="data-ref">
@@ -128,6 +126,8 @@ <h3 id="swt">SWT Binary and Source
128126
return data
129127
})
130128

129+
injectUnstableBuildCause('build-state-container')
130+
131131
contentPostProcessor = (mainElement, build) => {
132132
document.title = `${build.label} - ${document.title}`
133133

@@ -139,15 +139,13 @@ <h3 id="swt">SWT Binary and Source
139139
const testResultsTable = document.getElementById('tests-overview-table')
140140
const tBody = testResultsTable.createTBody()
141141
testResultsOverview.then(testResults => {
142-
let completedTests = 0
143142
for (let r = 0; r < testResults.length; r++) {
144143
const row = tBody.insertRow()
145144
const result = testResults[r]
146145
const testName = build.expectedTests[r]
147-
//TODO: compute nicer, non-breaking label (like for file Platforms?) and align elements horizontally
148-
const label = `<a href="reports.html#tests">${testName}</a>`
146+
const [os, ws, arch, javaVersion] = parseTestConfiguration(testName)
147+
const label = `<a href="reports.html#tests">${getOSLabel(os)} (${getCPUArchLabel(arch)}) Java&nbsp;${javaVersion}</a>`
149148
if (result.duration) { // Test configuration completed
150-
completedTests++
151149
row.innerHTML = `
152150
<td>${label}</td>
153151
<td style="text-align:end">${result.failCount}</td>
@@ -163,8 +161,6 @@ <h3 id="swt">SWT Binary and Source
163161
`
164162
}
165163
}
166-
// Inject test completion state
167-
document.getElementById('test-completion-state').innerHTML = `${completedTests} of ${testResults.length}`
168164
})
169165

170166
if (build.signOffIssue) {
@@ -189,7 +185,7 @@ <h3 id="swt">SWT Binary and Source
189185
const tBody = table.createTBody()
190186
for (const file of filesData) {
191187
tBody.insertRow().innerHTML = `
192-
<td>${file.icon ? `<img src="${file.icon}">` : ''} ${file.platform ? file.platform : getPlatformLabel(file.name)}</td>
188+
<td>${file.platform ? file.platform : getPlatformLabel(file.name)}</td>
193189
<td>
194190
<a href="${file.name}">${file.name}</a>
195191
</td>
@@ -206,13 +202,6 @@ <h3 id="swt">SWT Binary and Source
206202
return `${os} (${arch})`
207203
}
208204

209-
fetch('buildUnstable').then(res => res.status == 404 ? '' : res.text()).then(msg => {
210-
if (msg) {
211-
const statusLabel = document.getElementById('build-state-container')
212-
statusLabel.innerHTML = '<a href="https://wiki.eclipse.org/Platform-releng/Unstable_build" title="Unstable Build" style="color:red;"><b>Unstable!</b></a>' + msg
213-
}
214-
})
215-
216205
generate()
217206

218207
</script>

‎sites/eclipse/build/repo.gif‎

-353 Bytes
Binary file not shown.

‎sites/eclipse/build/reports.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ <h3 id="compiler-issues">Compile issues</h3>
9494
for (const testConfig of build.expectedTests) {
9595
const [os, ws, arch, javaVersion] = parseTestConfiguration(testConfig)
9696
const headerCell = document.createElement('th');
97-
headerCell.innerHTML = `${getOSLabel(os)}<br/>${getCPUArchLabel(arch)}<br/>Java ${javaVersion}`
97+
headerCell.innerHTML = `${getOSLabel(os)}<br/>${getCPUArchLabel(arch)}<br/>Java&nbsp;${javaVersion}`
9898
headerCell.style = 'text-align:center'
9999
testConfigsHeadline.appendChild(headerCell)
100100
expectedTestsLongNames.push(getLongTestConfigurationName(testConfig, build))

‎sites/eclipse/build/testresults/logs.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<h2>Test Console Logs for <span class="data-ref">${label}</span></h2>
2121
<h3 id="console">Console Logs</h3>
2222
<p>These logs contain the console output captured while running the JUnit automated tests.</p>
23-
<ul id="test-console-files" style="list-style-type:square;">
23+
<ul id="test-console-files">
2424
</ul>
2525
<div id="test-logs-container"></div>
2626

@@ -51,11 +51,11 @@ <h3 id="console">Console Logs</h3>
5151

5252
let testLogsList = `
5353
<h4>Individual test logs from ${testConfigLong}</h4>
54-
<ul style="list-style-type:square;">
54+
<ul>
5555
`
5656
let directorLogsList = `
5757
<h4>P2 director logs while installing tests on ${testConfigLong}</h4>
58-
<ul style="list-style-type:square;">
58+
<ul>
5959
`
6060
for (const testName of tests) {
6161
const test = testsSummary[testName]

0 commit comments

Comments
 (0)