Streamline and clean-up overview section of build websites

JenkinsJobs/Builds/build.jenkinsfile

@@ -452,7 +452,7 @@ pipeline {
 									sh '''#!/bin/bash -xe
 										dropDir=${DROP_DIR}/${BUILD_ID}
 										if [ -n "${COMPARATOR_ERRORS_SUBJECT}" ]; then
-											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
+											echo "This build has been marked unstable due to <a href='buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt'>unanticipated comparator errors</a>." > ${dropDir}/buildUnstable
 										fi
 										scp -r ${dropDir} genie.releng@projects-storage.eclipse.org:${EP_ECLIPSE_DROPS}/.
 									'''
@@ -542,7 +542,7 @@ pipeline {
 									sh '''#!/bin/bash -xe
 										dropDir=${EQUINOX_DROP_DIR}/${BUILD_ID}
 										if [ -n "${COMPARATOR_ERRORS_SUBJECT}" ]; then
-											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
+											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
 										fi
 										scp -r ${dropDir} genie.releng@projects-storage.eclipse.org:${EP_EQUINOX_DROPS}/.
 									'''
@@ -656,7 +656,7 @@ pipeline {
 			https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}
 
 			Build logs and/or test results (eventually):
-			https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/reports.html#tests
+			https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/reports.html
 			""" + (env.COMPARATOR_ERRORS_SUBJECT == '' ? '' : """
 			Check unanticipated comparator messages:
 			https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt

JenkinsJobs/Builds/markBuild.jenkinsfile

@@ -46,7 +46,7 @@ pipeline {
 								# Convert URL of GH issue or PR into: 'organization/repository#number'
 								label=$(echo "${issueURL##'https://github.com/'}" | sed 's/\\/issues\\//#/g' | sed 's/\\/pull\\//#/g')
 								#Add unstable tag
-								echo "<p>This build is marked unstable due to <a href='${issueURL}'>${label}</a>.</p>" > buildUnstable
+								echo "This build is marked unstable due to <a href='${issueURL}'>${label}</a>." > buildUnstable
 								scp buildUnstable genie.releng@projects-storage.eclipse.org:${EP_BUILD_DROP}/buildUnstable
 							;;
 							RETAINED_INDEFINITELY)

scripts/releng/BuildDropDataGenerator.java

@@ -78,7 +78,7 @@ void mainEclipsePageData() throws IOException {
 
 	// files
 	buildProperties.add("p2Repository", JSON.Array.create(//
-			createFileEntry("repository-" + buildId + ".zip", files, "All", "repo.gif")));
+			createFileEntry("repository-" + buildId + ".zip", files, "All")));
 
 	buildProperties.add("sdkProducts",
 			collectFileEntries(files, filename -> filename.startsWith("eclipse-SDK-") && !OS.isMacTarGZ(filename)));
@@ -89,7 +89,7 @@ void mainEclipsePageData() throws IOException {
 	JSON.Array platformProducts = collectFileEntries(files,
 			filename -> filename.startsWith("eclipse-platform-") && !OS.isMacTarGZ(filename));
 	platformProducts.add(createFileEntry( // Add separate entry for eclipse-platform product p2-repository
-			"org.eclipse.platform-" + buildId + ".zip", files, "Platform Runtime Repo", "repo.gif"));
+			"org.eclipse.platform-" + buildId + ".zip", files, "Platform Runtime Repo"));
 	buildProperties.add("platformProducts", platformProducts);
 
 	buildProperties.add("jdtCompiler", JSON.Array.create( //
@@ -200,22 +200,12 @@ JSON.Array colleFilesInDirectory(Path inDirectory, Predicate<String> filenameFil
 	return 100;
 })).thenComparing(Comparator.naturalOrder());
 
-JSON.Object createFileEntry(String filename, Map<Path, Long> buildFiles, String platform, String icon) {
-	return createFileEntry(Path.of(filename), buildFiles, platform, icon);
-}
-
 JSON.Object createFileEntry(String filename, Map<Path, Long> buildFiles, String platform) {
-	return createFileEntry(Path.of(filename), buildFiles, platform, null);
-}
-
-JSON.Object createFileEntry(Path filename, Map<Path, Long> buildFiles, String platform, String icon) {
-	JSON.Object file = createFileDescription(filename, buildFiles.get(filename));
+	Path filePath = Path.of(filename);
+	JSON.Object file = createFileDescription(filePath, buildFiles.get(filePath));
 	if (platform != null) {
 		file.add("platform", JSON.String.create(platform));
 	}
-	if (icon != null) {
-		file.add("icon", JSON.String.create(icon));
-	}
 	return file;
 }
 

sites/.gitignore

@@ -0,0 +1,6 @@
+eclipse/**/*.json
+equinox/**/*.json
+eclipse/build/compilelogs/**/*.xml
+
+eclipse/build/buildUnstable
+equinox/build/buildUnstable

sites/eclipse/build/buildlogs/logs.html

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

sites/eclipse/build/index.html

@@ -18,48 +18,46 @@
 	<main>
 
 		<h2>Eclipse <span class="data-ref">${release}</span> <span class="data-ref">${buildTypeName}</span> Build: <span class="data-ref">${label}</span></h2>
-		<p id="build-state-container"></p>
+
+		<div id="build-state-container"></div>
+
 		<p>
 			This page provides access to the various deliverables of Eclipse Platform build along with its logs and tests.
 		</p>
-		<p>
-			<a class="data-ref" href="https://eclipse.dev/eclipse/news/${releaseShort}">New and Noteworthy</a>
-			<br />
-			<a class="data-ref" href="https://eclipse.dev/eclipse/markdown/?f=news/${releaseShort}/acknowledgements.md">Acknowledgments</a>
-			<br />
-			<a class="data-ref" href="https://eclipse.dev/eclipse/development/readme.html?file=readme_eclipse_${releaseShort}.html">Eclipse Project ${releaseShort} Readme</a>
-			<br />
-			<a class="data-ref" href="https://eclipse.dev/eclipse/development/plans.html?file=plans/eclipse_project_plan_${releaseShort}.xml">Eclipse Project Plan</a>
-			<br />
-		</p>
-
-		<h3>Logs and Test Links</h3>
 		<ul>
-			<li>View the <a href="reports.html#logs">logs for the current build</a>.</li>
-			<li>View the <a href="reports.html#tests">integration and unit test results for the current build.</a>.</li>
+			<li><a class="data-ref" href="https://eclipse.dev/eclipse/news/${releaseShort}">New and Noteworthy</a></li>
+			<li><a class="data-ref" href="https://eclipse.dev/eclipse/markdown/?f=news/${releaseShort}/acknowledgements.md">Acknowledgments</a></li>
+			<li><a class="data-ref" href="https://eclipse.dev/eclipse/development/readme.html?file=readme_eclipse_${releaseShort}.html">Eclipse Project ${releaseShort} Readme</a></li>
+			<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>
+			<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>
 		</ul>
 
-		<h3 id="tests">Summary of Unit Test Results</h3>
+		<h3 id="reports">Reports</h3>
 		<p>
-			<span id="test-completion-state">No</span> integration and unit test configurations are complete.
+			The <a href="reports.html">Reports page</a> provides detailed build and tests logs and analyses of various aspects of this build.
 		</p>
+
+		<h4 id="tests">Test Results Summary</h4>
 		<p id="signOff-issue-container"></p>
 		<table id="tests-overview-table">
 			<thead>
 				<tr>
-					<th style="text-align:center; width:25%">Tested Platform</th>
-					<th style="text-align:center">Failed</th>
-					<th style="text-align:center">Passed</th>
-					<th style="text-align:center">Total</th>
-					<th style="text-align:center">Runtime</th>
+					<th style="text-align:center; width:30%">Tested Platform</th>
+					<th style="text-align:end">Failed</th>
+					<th style="text-align:end">Passed</th>
+					<th style="text-align:end">Total</th>
+					<th style="text-align:end">Runtime</th>
 				</tr>
 			</thead>
 		</table>
 
-		<h3>Related Links</h3>
+		<h4 id="git-log">Git Log</h4>
 		<ul>
-			<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>
 			<li><a href="gitLog.html">Git log</a></li>
+		</ul>
+
+		<h4 id="signatures">Checksums&nbsp;(SHA 512) and GPG&nbsp;Signatures</h4>
+		<ul>
 			<li><a href="https://wiki.eclipse.org/Platform-releng/How_to_check_integrity_of_downloads">How to verify a download</a></li>
 		</ul>
 		<p class="data-ref">
@@ -128,6 +126,8 @@ <h3 id="swt">SWT Binary and Source
 			return data
 		})
 
+		injectUnstableBuildCause('build-state-container')
+
 		contentPostProcessor = (mainElement, build) => {
 			document.title = `${build.label} - ${document.title}`
 
@@ -139,15 +139,13 @@ <h3 id="swt">SWT Binary and Source
 			const testResultsTable = document.getElementById('tests-overview-table')
 			const tBody = testResultsTable.createTBody()
 			testResultsOverview.then(testResults => {
-				let completedTests = 0
 				for (let r = 0; r < testResults.length; r++) {
 					const row = tBody.insertRow()
 					const result = testResults[r]
 					const testName = build.expectedTests[r]
-					//TODO: compute nicer, non-breaking label (like for file Platforms?) and align elements horizontally
-					const label = `<a href="reports.html#tests">${testName}</a>`
+					const [os, ws, arch, javaVersion] = parseTestConfiguration(testName)
+					const label = `<a href="reports.html#tests">${getOSLabel(os)} (${getCPUArchLabel(arch)}) Java&nbsp;${javaVersion}</a>`
 					if (result.duration) { // Test configuration completed
-						completedTests++
 						row.innerHTML = `
 							<td>${label}</td>
 							<td style="text-align:end">${result.failCount}</td>
@@ -163,8 +161,6 @@ <h3 id="swt">SWT Binary and Source
 						`
 					}
 				}
-				// Inject test completion state
-				document.getElementById('test-completion-state').innerHTML = `${completedTests} of ${testResults.length}`
 			})
 
 			if (build.signOffIssue) {
@@ -189,7 +185,7 @@ <h3 id="swt">SWT Binary and Source
 				const tBody = table.createTBody()
 				for (const file of filesData) {
 					tBody.insertRow().innerHTML = `
-					<td>${file.icon ? `<img src="${file.icon}">` : ''} ${file.platform ? file.platform : getPlatformLabel(file.name)}</td>
+					<td>${file.platform ? file.platform : getPlatformLabel(file.name)}</td>
 					<td>
 						<a href="${file.name}">${file.name}</a>
 					</td>
@@ -206,13 +202,6 @@ <h3 id="swt">SWT Binary and Source
 			return `${os} (${arch})`
 		}
 
-		fetch('buildUnstable').then(res => res.status == 404 ? '' : res.text()).then(msg => {
-			if (msg) {
-				const statusLabel = document.getElementById('build-state-container')
-				statusLabel.innerHTML = '<a href="https://wiki.eclipse.org/Platform-releng/Unstable_build" title="Unstable Build" style="color:red;"><b>Unstable!</b></a>' + msg
-			}
-		})
-
 		generate()
 
 	</script>

sites/eclipse/build/reports.html

@@ -94,7 +94,7 @@ <h3 id="compiler-issues">Compile issues</h3>
 			for (const testConfig of build.expectedTests) {
 				const [os, ws, arch, javaVersion] = parseTestConfiguration(testConfig)
 				const headerCell = document.createElement('th');
-				headerCell.innerHTML = `${getOSLabel(os)}<br/>${getCPUArchLabel(arch)}<br/>Java ${javaVersion}`
+				headerCell.innerHTML = `${getOSLabel(os)}<br/>${getCPUArchLabel(arch)}<br/>Java&nbsp;${javaVersion}`
 				headerCell.style = 'text-align:center'
 				testConfigsHeadline.appendChild(headerCell)
 				expectedTestsLongNames.push(getLongTestConfigurationName(testConfig, build))

sites/eclipse/build/testresults/logs.html

@@ -20,7 +20,7 @@
 		<h2>Test Console Logs for <span class="data-ref">${label}</span></h2>
 		<h3 id="console">Console Logs</h3>
 		<p>These logs contain the console output captured while running the JUnit automated tests.</p>
-		<ul id="test-console-files" style="list-style-type:square;">
+		<ul id="test-console-files">
 		</ul>
 		<div id="test-logs-container"></div>
 
@@ -51,11 +51,11 @@ <h3 id="console">Console Logs</h3>
 
 					let testLogsList = `
 						<h4>Individual test logs from ${testConfigLong}</h4>
-						<ul style="list-style-type:square;">
+						<ul>
 					`
 					let directorLogsList = `
 						<h4>P2 director logs while installing tests on ${testConfigLong}</h4>
-						<ul style="list-style-type:square;">
+						<ul>
 					`
 					for (const testName of tests) {
 						const test = testsSummary[testName]

sites/eclipse/page.css

@@ -12,10 +12,6 @@
 	margin-bottom: 5px;
 }
 
-#copyright {
-	padding-left: 0;
-}
-
 table {
 	table-layout: fixed;
 	width: 100%;
@@ -55,6 +51,38 @@ td {
 	padding: 5px;
 }
 
+ul {
+	list-style-type: square;
+}
+
+code {
+	background-color: lavender;
+	color: darkslategray;
+	border-radius: 2px;
+}
+
+/* table of content */
+
+li.toc-item {
+	padding: 3px;
+	list-style-type: none;
+}
+
+li.toc-item:hover {
+	background-color: gainsboro;
+}
+
+li.toc-item a {
+	/*Supress styling of links in TOC items*/
+	color: inherit;
+	text-decoration: none;
+}
+
+.error-message-box {
+	background-color: #ffdddd;
+	border-left: 6px solid crimson;
+	padding: 5px;
+}
 
 /* Collapsibles/accordion tables */
 .collapsible-table-main-row {
@@ -69,7 +97,7 @@ td {
 .collapsible-table-animation-wrapper {
 	display: grid;
 	grid-template-rows: 0fr;
-	transition: grid-template-rows 0.3s ease-out;
+	transition: grid-template-rows 0.5s ease-out;
 }
 
 /*Use a grid wrapper to transition from 0fr (closed) to 1fr (open).*/