Merge branch 'develop' into v2.2-rc1

JeffersonLab · Sep 12, 2019 · 4a7b64f · 4a7b64f
2 parents 2790229 + dbfd69e
commit 4a7b64f
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,14 +14,14 @@ script:
     docker run -t jeffersonlab/remoll sh -c "
       scripts/tests/test_macros.sh ${suite} &&
       scripts/tests/targz_macros.sh ${suite} &&
-      scripts/tests/watermark.sh rootfiles/tests/${suite}/analysis
+      scripts/tests/watermark.sh ${suite}
     " || exit 1 ;
-    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.log.tar.gz" . ;
-    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.root.tar.gz" . ;
-    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.analysis.log.tar.gz" . ;
-    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.analysis.pdf.tar.gz" . ;
-    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.analysis.root.tar.gz" . ;
-    docker cp $(docker ps -l -q):"/jlab/remoll/rootfiles_tests_${suite}_analysis.pdf" . ;
+    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.*.*.log.tar.gz" . ;
+    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.*.*.root.tar.gz" . ;
+    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.*.*.analysis.log.tar.gz" . ;
+    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.*.*.analysis.pdf.tar.gz" . ;
+    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.*.*.analysis.root.tar.gz" . ;
+    docker cp $(docker ps -l -q):"/jlab/remoll/rootfiles_tests_*_*_analysis.pdf" . ;
     docker rm $(docker ps -l -q) ;
   done
 
@@ -40,19 +40,14 @@ deploy:
   provider: releases
   api_key:
     secure: MzvvPA8KxYjEVa8C9rNtAQbtD+mDx2Wn3Em02JKMtwv953Htnv3zRcyGPfF++sLV80RvZ8NZ8pN3WfiAPTBHatUSgWh9w+GRv0G366wxKrAS4O+9BVy96U7A0gFkaXRwXirJWo4u2lJscQ1hC2IDbI2dGAS/VF5Lt1TLjWcPUL8LPcKgF80FG8+9+BUH1cRiW8mULT36EeVAB1K+vwO6Qob5k4ef66eHjkbdpuUktDr6wrehoyGXtFiBfl+XWotvcrer/51J6wn85UqCc/A+KYrVshBH/gKCD7/w6D2akNM2/sJcFdLzv5WkaQOwplsAYuzLn1cNRUKbWay5ClCSm6rsoHGfaagW4/wXk9TxqJhcdmNZ+eeAvNXAxJIeRvb82pwANlSJ658FBw2ov75p3Y6rjvc8CUPsxBXZkw3dzOgwTdjmJI9q+aD4GuVeGiq9MdyJDgXUjxlP2qEtcLJfvvF9q5Bnzy+hoAV+A5yHg0lR0VjsUem2+CdexuHb/LJLx4YVkSrCSyEELAsfyJTCYNLaMKrWKujelqtKwXy4H/rwzaja6IBP77gkisNI82bvnrzn/QsvnueGyWSu/Z2HC2M/d6WAQAl3Et9W6kOb7MK+NAmEMOTW7tzaxjD+lq8aOiLJYndrOYaymin5GLNk3F2iqZMkhMCRC2YcstNr61w=
+  file_glob: true
   file:
-  - remolltest.commit.log.tar.gz
-  - remolltest.commit.root.tar.gz
-  - remolltest.commit.analysis.log.tar.gz
-  - remolltest.commit.analysis.pdf.tar.gz
-  - remolltest.commit.analysis.root.tar.gz
-  - rootfiles_tests_release_analysis.pdf
-  - remolltest.release.log.tar.gz
-  - remolltest.release.root.tar.gz
-  - remolltest.release.analysis.log.tar.gz
-  - remolltest.release.analysis.pdf.tar.gz
-  - remolltest.release.analysis.root.tar.gz
-  - rootfiles_tests_release_analysis.pdf
+  - "remolltest.*.*.log.tar.gz"
+  - "remolltest.*.*.root.tar.gz"
+  - "remolltest.*.*.analysis.log.tar.gz"
+  - "remolltest.*.*.analysis.pdf.tar.gz"
+  - "remolltest.*.*.analysis.root.tar.gz"
+  - "rootfiles_tests_*_*_analysis.pdf"
   skip_cleanup: true
   on:
     repo: JeffersonLab/remoll

diff --git a/scripts/tests/targz_macros.sh b/scripts/tests/targz_macros.sh
@@ -16,9 +16,9 @@ suite="${1:-commit}"
 branch=`git rev-parse --abbrev-ref HEAD`
 
 # Pack log files
-tar -czvf remolltest.${suite}.log.tar.gz            --transform 's|logfiles/tests/||g'      logfiles/tests/${suite}/${branch}/*.log
-tar -czvf remolltest.${suite}.analysis.log.tar.gz   --transform 's|logfiles/tests/||g'      logfiles/tests/${suite}/${branch}/analysis/*.log
+tar -czvf remolltest.${suite}.${branch}.log.tar.gz           --transform 's|logfiles/tests/||g'  logfiles/tests/${suite}/${branch}/*.log
+tar -czvf remolltest.${suite}.${branch}.analysis.log.tar.gz  --transform 's|logfiles/tests/||g'  logfiles/tests/${suite}/${branch}/analysis/*.log
 # Pack analysis products
-tar -czvf remolltest.${suite}.root.tar.gz           --transform 's|rootfiles/tests/||g'     rootfiles/tests/${suite}/${branch}/*.root
-tar -czvf remolltest.${suite}.analysis.pdf.tar.gz   --transform 's|rootfiles/tests/||g'     rootfiles/tests/${suite}/${branch}/analysis/*.pdf
-tar -czvf remolltest.${suite}.analysis.root.tar.gz  --transform 's|rootfiles/tests/||g'     rootfiles/tests/${suite}/${branch}/analysis/*.root
+tar -czvf remolltest.${suite}.${branch}.root.tar.gz          --transform 's|rootfiles/tests/||g' rootfiles/tests/${suite}/${branch}/*.root
+tar -czvf remolltest.${suite}.${branch}.analysis.pdf.tar.gz  --transform 's|rootfiles/tests/||g' rootfiles/tests/${suite}/${branch}/analysis/*.pdf
+tar -czvf remolltest.${suite}.${branch}.analysis.root.tar.gz --transform 's|rootfiles/tests/||g' rootfiles/tests/${suite}/${branch}/analysis/*.root
diff --git a/scripts/tests/watermark.sh b/scripts/tests/watermark.sh
@@ -1,5 +1,23 @@
 #!/bin/bash
 
+shopt -s nullglob
+
+# Exit whenever non-zero exit code occurs
+set -euo pipefail
+
+# Determine absolute path of this script
+dir=`dirname $0`/../..
+dir=`readlink -f ${dir}`
+
+# The test suite can be specified as first argument, default is "commit"
+suite="${1:-commit}"
+
+# The branch name is used to avoid clobbering comparative output
+branch=`git rev-parse --abbrev-ref HEAD`
+
+# Set test suite output directories
+rootfiles="rootfiles/tests/${suite}/${branch}"
+
 # Create a transparent stamp and send to stdout
 function stamp() {
 ps2pdf -sPAPERSIZE=letter - - <<EOF
@@ -19,10 +37,10 @@ EOF
 # Loop over arguments assumed to be directories
 while [ $# -gt 0 ] ; do
   # Stamp all pdf files in directory
-  for file in $1/*.pdf ; do
+  for file in ${rootfiles}/analysis/*.pdf ; do
     stamp $file | pdftk - stamp $file output $file.new && mv $file.new $file
   done
   # Concatenate them all
-  pdftk $1/*.pdf cat output ${1//\//_}.pdf
+  pdftk ${rootfiles}/analysis/*.pdf cat output ${rootfiles//\//_}.pdf
   shift
 done