Upload newly generated resource monitor files

Author: smuzaffar

config.map

@@ -2,7 +2,7 @@ SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/ma
 SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/master;RELEASE_BRANCH=CMSSW_16_0_FASTPU_X;RELEASE_QUEUE=CMSSW_16_0_FASTPU_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;
 SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_DBG_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=1,3,5;
 SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/fp;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_FP_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=0,2,4;BUILD_OPTS=frame_pointer;
-SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_NONLTO_X;DOCKER_IMG=cmssw;PR_TESTS=1;BUILD_OPTS=estats,no-lto,microarchs:x86-64-v2;
+SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_NONLTO_X;DOCKER_IMG=cmssw;PR_TESTS=1;BUILD_OPTS=no-lto,microarchs:x86-64-v2;
 SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/py312;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_PY312_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;
 SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/tf;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_TF_X;DOCKER_IMG=cmssw;BUILD_DAY=2;BUILD_HOUR=11;
 SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_MKLDNN_X;DOCKER_IMG=cmssw;BUILD_DAY=1;BUILD_HOUR=23;BUILD_OPTS=tf_mkldnn;
@@ -16,7 +16,7 @@ SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/g4
 SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/g4;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_G4VECGEOM_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=0,3;
 SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/g4adept;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_G4ADEPT_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=0,3;BUILD_OPTS=no-biglib,no-lto;
 SCRAM_ARCH=el9_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23,00;MULTIARCH_OPTS=x86-64-v2;ADDITIONAL_TESTS=gpu-qa,gpu-relvals;
-SCRAM_ARCH=el8_aarch64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_OPTS=estats;
+SCRAM_ARCH=el8_aarch64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;
 SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/devel;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_DEVEL_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_OPTS=warnings;MULTIARCH_OPTS=x86-64-v2;PR_TESTS=1;
 SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/rootmaster;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_ROOT6_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;PR_TESTS=1;
 SCRAM_ARCH=el8_aarch64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_0_X/rootmaster;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_16_0_ROOT6_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;

pr_testing/_helper_functions.sh

@@ -104,8 +104,8 @@ function prepare_upload_results (){
           mkdir -p ${LOCAL_LOGDIR}/${xdir}
           mv ${dir}/log ${LOCAL_LOGDIR}/${xdir}/
           [ -e ${dir}/src-logs.tgz ] && mv ${dir}/src-logs.tgz ${LOCAL_LOGDIR}/${xdir}/
-          json=$(basename $(dirname $dir)).json
-          [ -e "${dir}/${json}" ] && mv ${dir}/${json} ${LOCAL_LOGDIR}/${xdir}/
+          pkg=$(basename $(dirname $dir))
+          [ -e "${dir}/${pkg}.json" ] && mv ${dir}/${pkg}*.json ${LOCAL_LOGDIR}/${xdir}/
           [ -e "${dir}/opts.json" ] && mv ${dir}/opts.json ${LOCAL_LOGDIR}/${xdir}/
         done
       popd