From 4174b905424b75e342b3bd0c68789ef021b61778 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 21 Mar 2023 17:03:45 -0400 Subject: [PATCH] jjb: archive top-level test suite log Change-Id: Idae0b28eb6b6a69153f9caa98566935275dc2987 Signed-off-by: Michael Jeanson --- jobs/babeltrace.yaml | 2 +- jobs/librseq.yaml | 2 +- jobs/liburcu.yaml | 2 +- jobs/lttng-tools.yaml | 2 +- jobs/lttng-ust.yaml | 2 +- scripts/babeltrace/build.sh | 3 +++ scripts/librseq/build.sh | 3 +++ scripts/liburcu/build.sh | 3 +++ scripts/lttng-tools/build.sh | 5 +++++ scripts/lttng-ust/build.sh | 3 +++ 10 files changed, 22 insertions(+), 5 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 3c9684f..6be2b73 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -215,7 +215,7 @@ - archive: &babeltrace_publisher_archive_defaults - artifacts: 'build/**,tap/**' + artifacts: 'build/**,tap/**,log/**' allow-empty: false - workspace-cleanup: &babeltrace_publisher_workspace-cleanup_defaults clean-if: diff --git a/jobs/librseq.yaml b/jobs/librseq.yaml index 2487843..45e41f2 100644 --- a/jobs/librseq.yaml +++ b/jobs/librseq.yaml @@ -150,7 +150,7 @@ - archive: &librseq_publisher_archive_defaults - artifacts: 'build/**,tap/**' + artifacts: 'build/**,tap/**,log/**' allow-empty: false - workspace-cleanup: &librseq_publisher_workspace-cleanup_defaults clean-if: diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index abd0878..e1f5c39 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -159,7 +159,7 @@ - archive: &liburcu_publisher_archive_defaults - artifacts: 'build/**,tap/**' + artifacts: 'build/**,tap/**,log/**' allow-empty: false - workspace-cleanup: &liburcu_publisher_workspace_cleanup_defaults clean-if: diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index d7a0004..53d7fe7 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -431,7 +431,7 @@ - archive: <tng-tools_publisher_archive_defaults - artifacts: 'build/**,deps/**,tap/**' + artifacts: 'build/**,deps/**,tap/**,log/**' allow-empty: false - workspace-cleanup: <tng-tools_publisher_workspace-cleanup_defaults diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index 2362ab2..03cb8a3 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -238,7 +238,7 @@ - archive: <tng-ust_publisher_archive_defaults - artifacts: 'build/**,tap/**' + artifacts: 'build/**,tap/**,log/**' allow-empty: false - workspace-cleanup: <tng-ust_publisher_workspace-cleanup_defaults clean-if: diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index 8ab9261..6f2f0f7 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -373,6 +373,9 @@ if [ "$BABELTRACE_RUN_TESTS" = "yes" ]; then # Copy tap logs for the jenkins tap parser before cleaning the build dir rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap" + # Copy the test suites top-level log which includes all tests failures + rsync -a --include 'test-suite.log' --include '*/' --exclude='*' tests/ "$WORKSPACE/log" + # The test suite prior to 1.5 did not produce TAP logs if verlt "$PACKAGE_VERSION" "1.5"; then mkdir -p "$WORKSPACE/tap/no-log" diff --git a/scripts/librseq/build.sh b/scripts/librseq/build.sh index d56a399..95b770e 100755 --- a/scripts/librseq/build.sh +++ b/scripts/librseq/build.sh @@ -265,6 +265,9 @@ set -e # Copy tap logs for the jenkins tap parser before cleaning the build dir rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap" +# Copy the test suites top-level log which includes all tests failures +rsync -a --include 'test-suite.log' --include '*/' --exclude='*' tests/ "$WORKSPACE/log" + # Clean the build directory $MAKE clean diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh index 6fe33b5..b4cc761 100755 --- a/scripts/liburcu/build.sh +++ b/scripts/liburcu/build.sh @@ -318,6 +318,9 @@ if [ "$USERSPACE_RCU_RUN_TESTS" = "yes" ]; then # Copy tap logs for the jenkins tap parser before cleaning the build dir rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap" + # Copy the test suites top-level log which includes all tests failures + rsync -a --include 'test-suite.log' --include '*/' --exclude='*' tests/ "$WORKSPACE/log" + # The test suite prior to 0.11 did not produce TAP logs if verlt "$PACKAGE_VERSION" "0.11"; then mkdir -p "$WORKSPACE/tap/no-log" diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index c67802a..fb9703f 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -496,7 +496,12 @@ if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [ "$conf" != "no-ust" ]; then fi make --keep-going check || failed_tests=1 + + # Copy tap logs for the jenkins tap parser before cleaning the build dir rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$TAPDIR" + + # Copy the test suites top-level log which includes all tests failures + rsync -a --include 'test-suite.log' --include '*/' --exclude='*' tests/ "$WORKSPACE/log" else cd tests mkdir -p "$TAPDIR/unit" diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh index 44e0183..b31f8ff 100755 --- a/scripts/lttng-ust/build.sh +++ b/scripts/lttng-ust/build.sh @@ -331,6 +331,9 @@ if [ "$LTTNG_UST_RUN_TESTS" = "yes" ]; then # Copy tap logs for the jenkins tap parser before cleaning the build dir rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap" + # Copy the test suites top-level log which includes all tests failures + rsync -a --include 'test-suite.log' --include '*/' --exclude='*' tests/ "$WORKSPACE/log" + # The test suite prior to 2.8 did not produce TAP logs if verlt "$PACKAGE_VERSION" "2.8"; then mkdir -p "$WORKSPACE/tap/no-log" -- 2.34.1