Skip to content

Commit baaa238

Browse files
iguessthislldoiguessthislldo
authored
Merge pull request #8 from iguessthislldo/igtd/test-matrix
Allow Running Locally and Add Test Matrix
2 parents 11b4077 + be90669 commit baaa238

File tree

6 files changed

+100
-33
lines changed

6 files changed

+100
-33
lines changed

‎README.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# DOCGroup scoreboard configuration files
22

3+
## Adding to the scoreboard
4+
35
Edit one of the xml files in this repository to add builds to the
46
[DOCGroup](https://github.com/DOCGroup) scoreboard. These xml files will be used to generate
57
the [DOCGroup scoreboard](https://www.dre.vanderbilt.edu/scoreboard/).
8+
9+
## Running locally
10+
11+
To run locally, run `naboo_dre.sh` with these environment variables:
12+
13+
1. `AUTOBUILD_ROOT` - Path to [autobuild](https://github.com/DOCGroup/autobuild) to use.
14+
1. `OUTPUT` - Path to destination of the web site.
15+
16+
Otherwise they default to hardcoded paths that you probably don't want to use.

‎ace.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
<scoreboard>
2+
3+
<prop matrix_title="ACE Scoreboard Test Matrix"/>
4+
<prop matrix_basename="ace"/>
5+
<prop source_link="https://github.com/DOCGroup/ACE_TAO/blob/master/"/>
6+
27
<preamble>
3-
<center><h1>ACE Scoreboard</h1></center>
8+
<center>
9+
<h1>ACE Scoreboard</h1>
10+
<div style="font: bold 14pt verdana;">
11+
<a style="background-color: green; color: white; padding: 5px 5px;" href="ace-matrix.html">Test Matrix</a>
12+
</div>
13+
</center>
414
<hr/>
515
This is the ACE scoreboard. It shows all the OS/platform combinations on which
616
<a href="https://github.com/DOCGroup/ACE_TAO">ACE</a> is tested everyday.

‎ace6.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
<scoreboard>
2+
3+
<prop matrix_title="ACE 6.5.x Scoreboard Test Matrix"/>
4+
<prop matrix_basename="ace6"/>
5+
<prop source_link="https://github.com/DOCGroup/ACE_TAO/blob/ace6tao2/"/>
6+
27
<preamble>
3-
<center><h1>ACE 6.5.x Scoreboard</h1></center>
8+
<center>
9+
<h1>ACE 6.5.x Scoreboard</h1>
10+
<div style="font: bold 14pt verdana;">
11+
<a style="background-color: green; color: white; padding: 5px 5px;" href="ace6-matrix.html">Test Matrix</a>
12+
</div>
13+
</center>
414
<hr/>
515
This is the ACE scoreboard for ACE 6.5.x. It shows all the OS/platform combinations on which
616
<a href="https://github.com/DOCGroup/ACE_TAO/tree/ace6tao2">ACE 6.5.x</a> is tested everyday.

‎naboo_dre.sh‎

Lines changed: 45 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,56 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

3-
PERLLIB=autobuild
4-
export PERLLIB
5-
OUTPUTDIR=/export/web/www/scoreboard
6-
export OUTPUTDIR
7-
CONFIGDIR=$HOME/scoreboard
8-
export CONFIGDIR
3+
set -ue
94

10-
cd $HOME/scoreboard
11-
git pull
12-
cd $HOME/autobuild
5+
OUTPUT="${OUTPUT:-/export/web/www/scoreboard}"
6+
if ! [ -d "$OUTPUT" ]
7+
then
8+
echo "\$OUTPUT directory ($OUTPUT) does not exist"
9+
exit 1
10+
fi
11+
12+
SCOREBOARD_ROOT=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
13+
cd "$SCOREBOARD_ROOT"
1314
git pull
1415

15-
# Generate the index page!
16-
/usr/bin/perl ./scoreboard.pl -v -d $OUTPUTDIR -i $CONFIGDIR/index.xml 2>&1 &
17-
# Generate other pages!
18-
/usr/bin/perl ./scoreboard.pl -b -d $OUTPUTDIR -f $CONFIGDIR/ace.xml -o ace.html 2>&1 &
19-
/usr/bin/perl ./scoreboard.pl -b -d $OUTPUTDIR -f $CONFIGDIR/ace6.xml -o ace6.html 2>&1 &
20-
/usr/bin/perl ./scoreboard.pl -b -d $OUTPUTDIR -f $CONFIGDIR/tao.xml -o tao.html 2>&1 &
21-
/usr/bin/perl ./scoreboard.pl -b -d $OUTPUTDIR -f $CONFIGDIR/tao2.xml -o tao2.html 2>&1 &
16+
AUTOBUILD_ROOT="${AUTOBUILD_ROOT:-$HOME/autobuild}"
17+
cd "$AUTOBUILD_ROOT"
18+
git pull
2219

23-
# Generate the test matrices!
24-
##testmatrix/update_scoreboard.sh 2>&1 &
20+
groups=(
21+
ace
22+
ace6
23+
tao
24+
tao2
25+
)
2526

26-
# Generate integrated pages!
27-
/usr/bin/perl ./scoreboard.pl -b -d /export/web/www/scoreboard -z -j $CONFIGDIR/ace.xml,$CONFIGDIR/ace6.xml,$CONFIGDIR/tao.xml,$CONFIGDIR/tao2.xml 2>&1 &
27+
# Generate the index page!
28+
/usr/bin/perl ./scoreboard.pl -v -d "$OUTPUT" -i "$SCOREBOARD_ROOT/index.xml"
2829

29-
#Generate build matrix
30-
#/usr/bin/perl buildmatrix/buildmatrix.pl $CONFIGDIR/ace.xml $OUTPUTDIR 1 > /project/taotmp/scoreboard/buildmatrix/output.html 2> /tmp/build.out
30+
xml_files=()
31+
for group in ${groups[@]}
32+
do
33+
echo "Generating pages for $group..."
34+
xml_file="$SCOREBOARD_ROOT/$group.xml"
35+
xml_files+=("$xml_file")
3136

32-
#/usr/bin/perl buildmatrix/buildmatrix.pl $CONFIGDIR/tao.xml $OUTPUTDIR 1 > /project/taotmp/scoreboard/buildmatrix/tao.html 2> /tmp/build.out
37+
# Generate the normal pages for this group
38+
/usr/bin/perl ./scoreboard.pl -b -d "$OUTPUT" -f "$xml_file" -o "$group.html" -v
3339

34-
#Remove the obsolete db files and give the list of available db files.
35-
##matrix_database/RemoveAndListCompilationDbFiles.sh
40+
# Generate the text matrix pages for this group
41+
./matrix.py "${OUTPUT}"
3642

37-
#
38-
wait
43+
# Remove the builds.json for this group
44+
rm "$OUTPUT/builds.json"
45+
done
3946

40-
exit 0
47+
# Generate integrated pages!
48+
echo "Generating integrated pages..."
49+
function join_by {
50+
local d=${1-} f=${2-}
51+
if shift 2
52+
then
53+
printf %s "$f" "${@/#/$d}"
54+
fi
55+
}
56+
/usr/bin/perl ./scoreboard.pl -b -d "$OUTPUT" -z -j "$(join_by , ${xml_files[@]})"

‎tao.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
<scoreboard>
2+
3+
<prop matrix_title="TAO Scoreboard Test Matrix"/>
4+
<prop matrix_basename="tao"/>
5+
<prop source_link="https://github.com/DOCGroup/ACE_TAO/blob/master/"/>
6+
27
<preamble>
3-
<center><h1>TAO Scoreboard</h1></center>
8+
<center>
9+
<h1>TAO Scoreboard</h1>
10+
<div style="font: bold 14pt verdana;">
11+
<a style="background-color: green; color: white; padding: 5px 5px;" href="tao-matrix.html">Test Matrix</a>
12+
</div>
13+
</center>
414
<hr/>
515
This is the TAO scoreboard. It shows all the OS/platform combinations on which
616
<a href="https://github.com/DOCGroup/ACE_TAO">TAO</a> is tested everyday.

‎tao2.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
<scoreboard>
2+
3+
<prop matrix_title="TAO 2.5.x Scoreboard Test Matrix"/>
4+
<prop matrix_basename="tao2"/>
5+
<prop source_link="https://github.com/DOCGroup/ACE_TAO/blob/ace6tao2/"/>
6+
27
<preamble>
3-
<center><h1>TAO 2.5.x Scoreboard</h1></center>
8+
<center>
9+
<h1>TAO 2.5.x Scoreboard</h1>
10+
<div style="font: bold 14pt verdana;">
11+
<a style="background-color: green; color: white; padding: 5px 5px;" href="tao2-matrix.html">Test Matrix</a>
12+
</div>
13+
</center>
414
<hr/>
515
This is the TAO 2.5.x scoreboard. It shows all the OS/platform combinations on which
616
<a href="https://github.com/DOCGroup/ACE_TAO/tree/ace6tao2">TAO 2.5.x</a> is tested everyday.

0 commit comments

Comments
 (0)