GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/abuild: Add all builds to junit.xml files 

The builds from the configs directory were not being saved in the
junit.xml files that Jenkins uses to determine pass vs fail of the
individual builds.

This also fixes the path to a log file that I noticed while testing.

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: I37dbee676cc9e507e612ce66994a04aba062757a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78863
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Martin Roth 2023-10-31 20:39:30 -06:00 committed by Martin L Roth
parent acbc491237
commit a49e7b974d
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
util/abuild/abuild
View File

@ -11,8 +11,8 @@
#set -x # Turn echo on.... #set -x # Turn echo on....
ABUILD_DATE="Feb 3, 2023" ABUILD_DATE="Nov 1, 2023"
ABUILD_VERSION="0.11.01" ABUILD_VERSION="0.11.02"
TOP=$PWD TOP=$PWD
@ -561,7 +561,7 @@ function build_config
tail -n $CONTEXT "$build_dir/config.log" 2> /dev/null || tail -$CONTEXT "$build_dir/config.log" tail -n $CONTEXT "$build_dir/config.log" 2> /dev/null || tail -$CONTEXT "$build_dir/config.log"
junit "</testcase>" junit "</testcase>"
echo "$BUILD_NAME - Log: ${TOP}/$build_dir/config.log" >> "$FAILED_BOARDS" echo "$BUILD_NAME - Log: $build_dir/config.log" >> "$FAILED_BOARDS"
return return
fi fi
@ -607,6 +607,18 @@ EOF
junit "</testcase>" junit "</testcase>"
} }
function record_mainboard
{
local log=$1
if test "$mode" != "text" && test -f "$TARGET/abuild/${log}.xml"; then
cat "$TARGET/abuild/${log}.xml" >> "$REAL_XMLFILE"
echo "$TARGET/abuild/${log}.xml written to $REAL_XMLFILE" >&2
else
echo "Warning: $TARGET/abuild/${log}.xml not found." >&2
fi
}
# One target may build several configs # One target may build several configs
function build_target function build_target
{ {
@ -630,6 +642,7 @@ function build_target
echo "Building config $BUILD_NAME" echo "Building config $BUILD_NAME"
build_dir=$TARGET/${BUILD_NAME} build_dir=$TARGET/${BUILD_NAME}
build_config "$MAINBOARD" "$build_dir" "$BUILD_NAME" "$config" build_config "$MAINBOARD" "$build_dir" "$BUILD_NAME" "$config"
record_mainboard "$BUILD_NAME"
remove_target "$BUILD_NAME" remove_target "$BUILD_NAME"
done done
fi fi
@ -637,6 +650,7 @@ function build_target
echo "Building board $MAINBOARD (using default config)" echo "Building board $MAINBOARD (using default config)"
build_dir=$TARGET/${MAINBOARD} build_dir=$TARGET/${MAINBOARD}
build_config "$MAINBOARD" "$build_dir" "$MAINBOARD" build_config "$MAINBOARD" "$build_dir" "$MAINBOARD"
record_mainboard "$MAINBOARD"
remove_target "$MAINBOARD" remove_target "$MAINBOARD"
} }
@ -1043,9 +1057,6 @@ if [ "$target" != "" ]; then
exit 1 exit 1
else else
build_target "${MAINBOARD}" build_target "${MAINBOARD}"
test "$mode" != "text" && \
test -f "$TARGET/abuild/${MAINBOARD}.xml" && \
cat "$TARGET/abuild/${MAINBOARD}.xml" >> "$REAL_XMLFILE"
XMLFILE=$REAL_XMLFILE XMLFILE=$REAL_XMLFILE
fi fi
else else