mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-11 23:16:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci-automation/tapfile_helper_lib.sh: read test output from file

Browse Source 
This change updates the tapfile helper to read test output from a file
instead of passig it inline in the SQL INSERT statement.
This fixes an issue with large error output from tests, which breaks
tap_ingest_tapfile():
    ci-automation/tapfile_helper_lib.sh: line 31: /usr/bin/sqlite3: Argument list too long
Error observed with the cl.toolbox.dnf-install test, which can generate
8000 lines of output. Fix tested with the same output.

Signed-off-by: Thilo Fromm <thilo@kinvolk.io>
This commit is contained in:
Thilo Fromm 2022-03-02 13:02:52 +01:00
parent ef9914e06e
commit 22af2876e6
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ci-automation/tapfile_helper_lib.sh
View File

@ -77,13 +77,14 @@ function __db_init() {
# 3: <run> - re-run iteration # 3: <run> - re-run iteration
function tap_ingest_tapfile() { function tap_ingest_tapfile() {
local tapfile="${1}" local tapfile="${1}"
local vendor="${2}" local vendor="${2}"
local run="${3}" local run="${3}"
local result="" local result=""
local test_name="" local test_name=""
local error_message="" local error_message_file="$(mktemp)"
local in_error_message=false local in_error_message=false
if ! [ -f "${TAPFILE_HELPER_DBNAME}" ] ; then if ! [ -f "${TAPFILE_HELPER_DBNAME}" ] ; then
@ -91,7 +92,10 @@ function tap_ingest_tapfile() {
fi fi
# Wrap all SQL commands in a transaction to speed up INSERTs # Wrap all SQL commands in a transaction to speed up INSERTs
# We will commit intermediately if there's an error message to insert so the
# error message file can be reused.
local SQL="BEGIN TRANSACTION;" local SQL="BEGIN TRANSACTION;"
local has_error_message="false"
# Example TAP input: # Example TAP input:
# ok - coreos.auth.verify # ok - coreos.auth.verify
@ -112,10 +116,12 @@ function tap_ingest_tapfile() {
if $in_error_message ; then if $in_error_message ; then
if [ "${line}" = "..." ] ; then if [ "${line}" = "..." ] ; then
in_error_message=false in_error_message=false
has_error_message="true"
else else
error_message="$(echo -e "$line" \ echo -e "$line" \
| sed -e 's/^Error: "--- FAIL: /"/' -e 's/^[[:space:]]*//' \ | sed -e 's/^Error: "--- FAIL: /"/' -e 's/^[[:space:]]*//' \
| sed -e "s/[>\"']/_/g" -e 's/[[:space:]]/ /g')" | sed -e "s/[>\"']/_/g" -e 's/[[:space:]]/ /g' \
>> "${error_message_file}"
continue continue
fi fi
else else
@ -128,18 +134,32 @@ function tap_ingest_tapfile() {
fi fi
fi fi
local test_output="/dev/null"
if [ "${has_error_message}" = "true" ] ; then
test_output="${error_message_file}"
fi
SQL="${SQL}INSERT OR IGNORE INTO test_case(name) VALUES ('${test_name}');" SQL="${SQL}INSERT OR IGNORE INTO test_case(name) VALUES ('${test_name}');"
SQL="${SQL}INSERT OR IGNORE INTO vendor(name) VALUES ('${vendor}');" SQL="${SQL}INSERT OR IGNORE INTO vendor(name) VALUES ('${vendor}');"
SQL="${SQL}INSERT OR REPLACE INTO test_run(run,result,output,case_id,vendor_id) SQL="${SQL}INSERT OR REPLACE INTO test_run(run,result,output,case_id,vendor_id)
VALUES ('${run}','${result}', '${error_message}', VALUES ('${run}','${result}', readfile('${test_output}'),
(SELECT id FROM test_case WHERE name='${test_name}'), (SELECT id FROM test_case WHERE name='${test_name}'),
(SELECT id FROM vendor WHERE name='${vendor}'));" (SELECT id FROM vendor WHERE name='${vendor}'));"
error_message=""
if [ "${has_error_message}" = "true" ] ; then
SQL="${SQL}COMMIT;"
__sqlite3_wrapper "${SQL}"
truncate --size 0 "${error_message_file}"
has_error_message="false"
SQL="BEGIN TRANSACTION;"
fi
done < "$tapfile" done < "$tapfile"
local SQL="${SQL}COMMIT;" rm -f "${error_message_file}"
SQL="${SQL}COMMIT;"
__sqlite3_wrapper "${SQL}" __sqlite3_wrapper "${SQL}"
} }
# -- # --