From 723b299a8f0f24f8498f8b3ce91d00940ebb2490 Mon Sep 17 00:00:00 2001
From: Fred Hornsey <hornseyf@objectcomputing.com>
Date: Mon, 16 Sep 2024 13:07:17 -0500
Subject: [PATCH] Update for Changes in Scoreboard and Matrix

https://github.com/DOCGroup/autobuild/pull/74
---
 README.md |  2 +-
 build.sh  | 37 +++++++------------------------------
 dds.xml   | 15 +++++++++------
 index.xml |  4 +++-
 4 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 8cad90c..e98645f 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,4 @@ Edit one of the xml files in this repository to add or remove a build.
 The `build.sh` script builds the scoreboard.
 It expects two environment variables to be set:
 1. `BUILDLOG_ROOT` - path to the downloaded log files and produced scoreboard.
-2. `AUTOBUILD_ROOT` - path to autobuild
+2. `AUTOBUILD_ROOT` - path to [autobuild](https://github.com/DOCGroup/autobuild)
diff --git a/build.sh b/build.sh
index 8df66dc..a313d0e 100755
--- a/build.sh
+++ b/build.sh
@@ -5,15 +5,16 @@
 # BUILDLOG_ROOT - directory for downloading and producing output
 # AUTOBUILD_ROOT - directory containing autobuild
 
-set -u
+set -ue
 
 SCOREBOARD_ROOT=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+TITLE="OpenDDS Build Scoreboard"
 
 echo "----- Starting mirror_scoreboard";
 
 if ! [ -d "${BUILDLOG_ROOT}" ]
 then
-    echo "BUILDLOG_ROOT (${BUILDLOG_DIR}) does not exist"
+    echo "BUILDLOG_ROOT (${BUILDLOG_ROOT}) does not exist"
     exit 1
 fi
 
@@ -22,34 +23,10 @@ echo "----- Building Main Index page"
 "${AUTOBUILD_ROOT}/scoreboard.pl" -v -i "${SCOREBOARD_ROOT}/index.xml" -d "${BUILDLOG_ROOT}"
 
 # Update the DDS scoreboard
-echo "----- Building DDS Build Scoreboard"
+echo "----- Building ${TITLE}"
 xml_file="${SCOREBOARD_ROOT}/dds.xml"
-"${AUTOBUILD_ROOT}/scoreboard.pl" -v -t "DDS Build Scoreboard" -f "${xml_file}" -d "${BUILDLOG_ROOT}" -o dds.html -c -k 10
+"${AUTOBUILD_ROOT}/scoreboard.pl" -v -t "${TITLE}" -f "${xml_file}" -d "${BUILDLOG_ROOT}" -o dds.html -c -k 10
 
-echo "----- Building test matrix for DDS Build Scoreboard"
+echo "----- Building test matrix for ${TITLE}"
 
-echo "Building list for dds"
-filelist=$(perl "${AUTOBUILD_ROOT}/testmatrix/test-list-extract.pl" -i "${xml_file}")
-
-otraw=/tmp/test_spread.raw
-rm -f "${otraw}"
-
-while IFS= read -r filedir
-do
-    latest="${BUILDLOG_ROOT}/${filedir}/latest.txt"
-    if file=$(cut -f 1 -d ' ' "${latest}" 2>/dev/null)
-    then
-        path="${BUILDLOG_ROOT}/${filedir}/${file}.txt"
-        echo "${filedir} ${path}" >> "${otraw}"
-    fi
-done < <(printf '%s\n' "${filelist}")
-
-(
-    cd "${AUTOBUILD_ROOT}/testmatrix"
-    python2 GenerateTestMatrix.py 0 "${otraw}" "${BUILDLOG_ROOT}" dds
-)
-
-# Copy the style sheet
-cp "${AUTOBUILD_ROOT}/testmatrix/matrix.css" "${BUILDLOG_ROOT}/matrix.css"
-
-exit
+"${AUTOBUILD_ROOT}/matrix.py" "${BUILDLOG_ROOT}"
diff --git a/dds.xml b/dds.xml
index 7289be6..4c713f0 100644
--- a/dds.xml
+++ b/dds.xml
@@ -1,11 +1,14 @@
 <scoreboard>
-  <preamble>
+  <prop matrix_title="OpenDDS Build Scoreboard Test Matrix"/>
+  <prop matrix_basename="opendds"/>
+  <prop source_link="https://github.com/OpenDDS/OpenDDS/blob/master/"/>
 
-    <div style="font: 20pt Verdana; color: green;">DDS Build Scoreboard</div>
+  <preamble>
+    <div style="font: 20pt Verdana; color: green;">OpenDDS Build Scoreboard</div>
     <br>
-      <div style="font: bold 14pt verdana;">
-        <a style="background-color: green; color: white; padding: 5px 5px;" href="dds.matrix.html">Test Matrix</a>
-      </div>
+    <div style="font: bold 14pt verdana;">
+      <a style="background-color: green; color: white; padding: 5px 5px;" href="opendds-matrix.html">Test Matrix</a>
+    </div>
   </preamble>
 
   <group>
@@ -19,7 +22,7 @@
       <name>Remedy_Fedora_Versioned</name>
       <url>https://download.remedy.nl/buildlogs/fc_opendds_versioned/</url>
       <diffroot>https://github.com/OpenDDS/OpenDDS/commit/</diffroot>
-    </build>  
+    </build>
     <build>
       <name>OCI_Ubuntu_22_04_GCC14</name>
       <url>https://storage.googleapis.com/oci-scoreboard/OpenDDS_ACE8_Ubuntu_22_04_GCC14_x64_Debug</url>
diff --git a/index.xml b/index.xml
index 65f59d5..adf1b72 100644
--- a/index.xml
+++ b/index.xml
@@ -1,9 +1,11 @@
 <intropage>
+  <prop title="OpenDDS Build Scoreboard"/>
+
   <preamble>
     <div style="font: 20pt Verdana; color: green;"><a href="https://opendds.org">OpenDDS Foundation</a> Scoreboard</div>
 
     <ul>
-      <li><a href="dds.html">DDS Scoreboard</a></li>
+      <li><a href="dds.html">OpenDDS Scoreboard</a></li>
     </ul>
 
     <p>