Updates

Skip-func-test: true

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

Author: phender

Jenkinsfile

@@ -285,21 +285,6 @@ Map unit_test_post_args(String name) {
     return args
 }
 
-Map nlt_post_args() {
-    Map args = [
-        artifacts: ['nlt_logs/'],
-        testResults: 'nlt-junit.xml',
-        always_script: 'ci/unit/test_nlt_post.sh',
-        valgrind_stash: 'el8-gcc-nlt-memcheck'
-    ]
-    if (code_coverage_enabled()) {
-        // args['artifacts'].add('covc_nlt_logs/')
-        args['ignore_failure'] = true
-        args['code_coverage'] = true
-    }
-    return args
-}
-
 String getScriptOutput(String script, String args='') {
     return sh(script: "${script} ${args}", returnStdout: true).trim()
 }
@@ -1234,7 +1219,7 @@ pipeline {
                     }
                     post {
                         always {
-                            unitTestPost artifacts: ['nlt_logs/'],
+                            unitTestPost artifacts: ['nlt_bullseye_logs/'],
                                          testResults: 'nlt-junit.xml',
                                          always_script: 'ci/unit/test_nlt_post.sh',
                                          compiler: 'covc',

ci/unit/test_nlt.sh

@@ -3,7 +3,7 @@
 # This is the script used for running utils/node_local_test.py (NLT)
 set -uex
 
-rm -rf nlt_logs
+rm -rf nlt_logs nlt_bullseye_logs
 
 # Remove any logs from a previous run
 rm -rf dnt.*.memcheck.xml vm_test/

ci/unit/test_nlt_node.sh

@@ -54,6 +54,7 @@ if [ -d "${BULLSEYE_DIR}" ]; then
     cp "${BULLSEYE_DIR}/daos/test.cov" "${COVFILE}"
     ls -al "${COVFILE}"
     nlt_args+=(--memcheck no)
+    nlt_args+=(--log-base-dir nlt_bullseye_logs)
 fi
 
 if [ -e "${COVFILE:-}" ]; then

ci/unit/test_nlt_post.sh

@@ -7,16 +7,29 @@ set -uex
 
 NODE="${NODELIST%%,*}"
 
-rm -rf nlt_logs
-mkdir nlt_logs
+case $STAGE_NAME in
+    "NLT on "*)
+      test_log_dir="nlt_logs"
+      ;;
+    "NLT with Bullseye on "*)
+      test_log_dir="nlt_bullseye_logs"
+      ;;
+    *)
+      echo "Unexpected STAGE_NAME '$STAGE_NAME' in test_nlt_post.sh"
+      exit 1
+      ;;
+esac
+
+rm -rf "$test_log_dir"
+mkdir "$test_log_dir"
 
 # Copy any log files.  Use rsync filters here to allow us to specify
 # all files we want to copy, as it's much more flexible than using
 # standard wildcards.
 rsync -v -dprt -e "ssh $SSH_KEY_ARGS" jenkins@"$NODE":/tmp/ \
       --filter="include dnt*.log" --filter="include dnt*.log.bz2" \
       --filter="include dnt_fi_*_logs" --filter="include test.cov" \
-      --filter="exclude *" nlt_logs/
+      --filter="exclude *" "${test_log_dir}/"
 
 rsync -v -dpt -z -e "ssh $SSH_KEY_ARGS" jenkins@"$NODE":build/ \
       --filter="include nlt*.json" --filter="include dnt*.xml" \

ci/unit/test_post_always.sh

@@ -35,12 +35,18 @@ case $STAGE_NAME in
     "NLT on "*)
       test_log_dir="nlt_logs"
       ;;
+    "NLT with Bullseye on "*)
+      test_log_dir="nlt_bullseye_logs"
+      ;;
     "Unit Test with memcheck on "*)
       test_log_dir="unit_test_memcheck_logs"
       ;;
     "Unit Test bdev with memcheck on "*)
       test_log_dir="unit_test_memcheck_bdev_logs"
       ;;
+    "Unit Test with Bullseye on "*)
+      test_log_dir="unit_test_bullseye_logs"
+      ;;
     *)
       test_log_dir="unkown_test_logs"
       ;;

utils/node_local_test.py

@@ -117,7 +117,7 @@ def __init__(self, json_file, args):
                                                  prefix='dnt_dfuse_')
         self.tmp_dir = None
         if args.class_name:
-            self.tmp_dir = join('nlt_logs', args.class_name)
+            self.tmp_dir = join(args.log_base_dir, args.class_name)
             if os.path.exists(self.tmp_dir):
                 for old_file in os.listdir(self.tmp_dir):
                     os.unlink(join(self.tmp_dir, old_file))
@@ -443,6 +443,11 @@ def get_base_env(clean=False):
     if http_proxy:
         env['HTTPS_PROXY'] = http_proxy
 
+    # If set, retain the COVFILE for bullseye code coverage
+    covfile = os.environ.get('COVFILE')
+    if covfile:
+        env['COVFILE'] = covfile
+
     # Enable this to debug memory errors, it has a performance impact but will scan the heap
     # for corruption.  See DAOS-12735 for why this can cause problems in practice.
     # env['MALLOC_CHECK_'] = '3'
@@ -6842,6 +6847,7 @@ def main():
     parser.add_argument('--exclude-test', action='append',
                         help='space separated list of tests to exclude')
     parser.add_argument('--valgrind_verbose', action='store_true', help='Use --verbose w/ valgrind')
+    parser.add_argument('--log-base-dir', default='nlt_logs', help='Base directory for log files')
     parser.add_argument('mode', nargs='*')
     args = parser.parse_args()