aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/bash/function
diff options
context:
space:
mode:
Diffstat (limited to 'resources/libraries/bash/function')
-rw-r--r--resources/libraries/bash/function/common.sh29
-rw-r--r--resources/libraries/bash/function/per_patch.sh4
2 files changed, 31 insertions, 2 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index 7348f25c47..0a4c94969d 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -147,7 +147,8 @@ function archive_tests () {
set -exuo pipefail
- tar c "${GENERATED_DIR}/tests" | xz -3 > "${ARCHIVE_DIR}/tests.tar.xz" || {
+ filename="generated_robot_files.tar.xz"
+ tar c "${GENERATED_DIR}/tests" | xz -3 > "${ARCHIVE_DIR}/${filename}" || {
die "Error creating archive of generated tests."
}
}
@@ -713,6 +714,8 @@ function run_pybot () {
# Run pybot with options based on input variables. Create output_info.xml
#
+ # Also, .info.json files are moved into an archive to speed up PAL.
+ #
# Variables read:
# - CSIT_DIR - Path to existing root of local CSIT git repository.
# - ARCHIVE_DIR - Path to store robot result files in.
@@ -735,7 +738,31 @@ function run_pybot () {
PYBOT_EXIT_STATUS="$?"
set -e
+ # Compress raw json outputs, if any.
+ pushd "${ARCHIVE_DIR}" || die
+ if [ -d "tests" ]; then
+ # Use deterministic order.
+ options+=("--sort=name")
+ # We are keeping info outputs where they are.
+ # Assuming we want to move anything but info files (and dirs).
+ options+=("--exclude=*.info.json")
+ # There may be other unforeseen errors,
+ # we still want to execute subsequent commands, so disable set -e.
+ set +e
+ tar cvf "tests_output_raw.tar" "${options[@]}" "tests"
+ # If compression fails, it leaves an uncompressed .tar,
+ # we still want to archive that to investigate why compression failed.
+ time xz -9e "tests_output_raw.tar"
+ # Tar can remove when archiving, but chokes (not deterministically)
+ # on attempting to remove dirs (not empty as info files are there).
+ # So we need to delete the raw files manually.
+ find "tests" -type f -name "*.raw.json" -delete
+ set -e
+ fi
+ popd || die
+
# Generate INFO level output_info.xml for post-processing.
+ # This comes last, as it is slowest, and sometimes users abort here.
all_options=("--loglevel" "INFO")
all_options+=("--log" "none")
all_options+=("--report" "none")
diff --git a/resources/libraries/bash/function/per_patch.sh b/resources/libraries/bash/function/per_patch.sh
index 4af3302008..b6a572d654 100644
--- a/resources/libraries/bash/function/per_patch.sh
+++ b/resources/libraries/bash/function/per_patch.sh
@@ -37,7 +37,9 @@ function archive_test_results () {
cd "${VPP_DIR}" || die "Change directory command failed."
TARGET="$(readlink -f "$1")"
mkdir -p "${TARGET}" || die "Directory creation failed."
- for filename in "output.xml" "log.html" "report.html"; do
+ file_list=("output.xml" "log.html" "report.html")
+ file_list+=("tests" "tests_output_raw.tar.xz")
+ for filename in "${file_list[@]}"; do
mv "${ARCHIVE_DIR}/${filename}" "${TARGET}/${filename}" || {
die "Attempt to move '${filename}' failed."
}