diff --git a/get_version_id b/get_version_id index 47ea664..b0b5685 100755 --- a/get_version_id +++ b/get_version_id @@ -1,4 +1,4 @@ #!/bin/sh -echo `ska_version`_`uname -i`_${HOSTNAME} +echo `ska_version`_`uname -s`_`uname -m`_${HOSTNAME} diff --git a/packages/acisfp_check/post_check_logs.py b/packages/acisfp_check/post_check_logs.py index 01a272d..15e0796 100644 --- a/packages/acisfp_check/post_check_logs.py +++ b/packages/acisfp_check/post_check_logs.py @@ -3,5 +3,8 @@ check_files('test_*.log', ['warning', 'error'], allows=['1% quantile value of', '99% quantile value of', - 'in output at out', - 'AstropyDeprecationWarning: out/states.dat already exists.']) + 'validation warning\(s\) in output', + 'fptemp violates ACIS-I limit', + 'fptemp violates FP-sensitive limit', + 'AstropyDeprecationWarning: out/states.dat already exists.', + 'AstropyDeprecationWarning: headout/states.dat already exists.']) diff --git a/packages/acisfp_check/post_regress.py b/packages/acisfp_check/post_regress.py index f47bad7..ce6ba8b 100644 --- a/packages/acisfp_check/post_regress.py +++ b/packages/acisfp_check/post_regress.py @@ -1,3 +1,4 @@ +import os from testr.packages import make_regress_files regress_files = ['out/index.rst', @@ -5,7 +6,9 @@ 'out/states.dat', 'out/temperatures.dat'] -clean = {'out/index.rst': [(r'^Run time.*', '')], - 'out/run.dat': [(r'#.*py run at.*', '')]} +clean = {'out/index.rst': [(r'^Run time.*', ''), + ('Load directory.*', '')], + 'out/run.dat': [(r'#.*run at.*', ''), + (os.environ['SKA'], '')]} make_regress_files(regress_files, clean=clean) diff --git a/packages/acisfp_check/post_regress_head.py b/packages/acisfp_check/post_regress_head.py new file mode 100644 index 0000000..c163599 --- /dev/null +++ b/packages/acisfp_check/post_regress_head.py @@ -0,0 +1,13 @@ +import os +from testr.packages import make_regress_files + +regress_files = ['headout/index.rst', + 'headout/run.dat', + 'headout/states.dat', + 'headout/temperatures.dat'] + +clean = {'headout/index.rst': [(r'^Run time.*', '')], + 'headout/run.dat': [(r'#.*py run at.*', ''), + (os.environ['SKA'], '')]} + +make_regress_files(regress_files, clean=clean) diff --git a/packages/acisfp_check/test_regress.sh b/packages/acisfp_check/test_regress.sh index b3d087f..de67e74 100644 --- a/packages/acisfp_check/test_regress.sh +++ b/packages/acisfp_check/test_regress.sh @@ -1,4 +1,6 @@ acisfp_check \ --outdir=out \ - --oflsdir=/data/acis/LoadReviews/2018/MAY2818/oflsa \ - --run-start=2018:142 + --oflsdir=${SKA}/data/ska_testr/test_loads/2019/MAY2019/oflsa \ + --nlet_file=${SKA}/data/ska_testr/test_loads/2019/MAY2019/oflsa/NonLoadTrackedEvents.txt \ + --state-builder=sql \ + --run-start=2019:135 diff --git a/packages/acisfp_check/test_regress_head.sh b/packages/acisfp_check/test_regress_head.sh new file mode 100644 index 0000000..e9861d4 --- /dev/null +++ b/packages/acisfp_check/test_regress_head.sh @@ -0,0 +1,4 @@ +acisfp_check \ + --outdir=headout \ + --oflsdir=/data/acis/LoadReviews/2018/MAY2818/oflsa \ + --run-start=2018:142 diff --git a/packages/dea_check/post_check_logs.py b/packages/dea_check/post_check_logs.py index 01a272d..099d85e 100644 --- a/packages/dea_check/post_check_logs.py +++ b/packages/dea_check/post_check_logs.py @@ -3,5 +3,6 @@ check_files('test_*.log', ['warning', 'error'], allows=['1% quantile value of', '99% quantile value of', - 'in output at out', + 'validation warning\(s\) in output', + 'AstropyDeprecationWarning: headout/states.dat already exists.', 'AstropyDeprecationWarning: out/states.dat already exists.']) diff --git a/packages/dea_check/post_regress.py b/packages/dea_check/post_regress.py index f47bad7..ce6ba8b 100644 --- a/packages/dea_check/post_regress.py +++ b/packages/dea_check/post_regress.py @@ -1,3 +1,4 @@ +import os from testr.packages import make_regress_files regress_files = ['out/index.rst', @@ -5,7 +6,9 @@ 'out/states.dat', 'out/temperatures.dat'] -clean = {'out/index.rst': [(r'^Run time.*', '')], - 'out/run.dat': [(r'#.*py run at.*', '')]} +clean = {'out/index.rst': [(r'^Run time.*', ''), + ('Load directory.*', '')], + 'out/run.dat': [(r'#.*run at.*', ''), + (os.environ['SKA'], '')]} make_regress_files(regress_files, clean=clean) diff --git a/packages/dea_check/post_regress_head.py b/packages/dea_check/post_regress_head.py new file mode 100644 index 0000000..c163599 --- /dev/null +++ b/packages/dea_check/post_regress_head.py @@ -0,0 +1,13 @@ +import os +from testr.packages import make_regress_files + +regress_files = ['headout/index.rst', + 'headout/run.dat', + 'headout/states.dat', + 'headout/temperatures.dat'] + +clean = {'headout/index.rst': [(r'^Run time.*', '')], + 'headout/run.dat': [(r'#.*py run at.*', ''), + (os.environ['SKA'], '')]} + +make_regress_files(regress_files, clean=clean) diff --git a/packages/dea_check/test_regress.sh b/packages/dea_check/test_regress.sh index 7763aaa..562b135 100644 --- a/packages/dea_check/test_regress.sh +++ b/packages/dea_check/test_regress.sh @@ -1,4 +1,6 @@ dea_check \ --outdir=out \ - --oflsdir=/data/acis/LoadReviews/2018/MAY2818/oflsa \ - --run-start=2018:142 + --oflsdir=${SKA}/data/ska_testr/test_loads/2019/MAY2019/oflsa \ + --nlet_file=${SKA}/data/ska_testr/test_loads/2019/MAY2019/oflsa/NonLoadTrackedEvents.txt \ + --state-builder=sql \ + --run-start=2019:135 diff --git a/packages/dea_check/test_regress_head.sh b/packages/dea_check/test_regress_head.sh new file mode 100644 index 0000000..354f770 --- /dev/null +++ b/packages/dea_check/test_regress_head.sh @@ -0,0 +1,4 @@ +dea_check \ + --outdir=headout \ + --oflsdir=/data/acis/LoadReviews/2018/MAY2818/oflsa \ + --run-start=2018:142 diff --git a/packages/dpa_check/post_check_logs.py b/packages/dpa_check/post_check_logs.py index baa8e01..9dd4d35 100644 --- a/packages/dpa_check/post_check_logs.py +++ b/packages/dpa_check/post_check_logs.py @@ -5,5 +5,6 @@ '1dpamzt violates planning limit of 35.50 deg', '50% quantile value of', '99% quantile value of', - 'in output at out', - 'AstropyDeprecationWarning: out/states.dat already exists.']) + 'validation warning\(s\) in output', + 'AstropyDeprecationWarning: out/states.dat already exists.', + 'AstropyDeprecationWarning: headout/states.dat already exists.']) diff --git a/packages/dpa_check/post_regress.py b/packages/dpa_check/post_regress.py index f47bad7..ce6ba8b 100644 --- a/packages/dpa_check/post_regress.py +++ b/packages/dpa_check/post_regress.py @@ -1,3 +1,4 @@ +import os from testr.packages import make_regress_files regress_files = ['out/index.rst', @@ -5,7 +6,9 @@ 'out/states.dat', 'out/temperatures.dat'] -clean = {'out/index.rst': [(r'^Run time.*', '')], - 'out/run.dat': [(r'#.*py run at.*', '')]} +clean = {'out/index.rst': [(r'^Run time.*', ''), + ('Load directory.*', '')], + 'out/run.dat': [(r'#.*run at.*', ''), + (os.environ['SKA'], '')]} make_regress_files(regress_files, clean=clean) diff --git a/packages/dpa_check/post_regress_head.py b/packages/dpa_check/post_regress_head.py new file mode 100644 index 0000000..c163599 --- /dev/null +++ b/packages/dpa_check/post_regress_head.py @@ -0,0 +1,13 @@ +import os +from testr.packages import make_regress_files + +regress_files = ['headout/index.rst', + 'headout/run.dat', + 'headout/states.dat', + 'headout/temperatures.dat'] + +clean = {'headout/index.rst': [(r'^Run time.*', '')], + 'headout/run.dat': [(r'#.*py run at.*', ''), + (os.environ['SKA'], '')]} + +make_regress_files(regress_files, clean=clean) diff --git a/packages/dpa_check/test_regress.sh b/packages/dpa_check/test_regress.sh index 45f331a..ced9bfa 100644 --- a/packages/dpa_check/test_regress.sh +++ b/packages/dpa_check/test_regress.sh @@ -1,4 +1,6 @@ dpa_check \ --outdir=out \ - --oflsdir=/data/acis/LoadReviews/2018/MAY2818/oflsa \ - --run-start=2018:142 + --oflsdir=${SKA}/data/ska_testr/test_loads/2019/MAY2019/oflsa \ + --nlet_file=${SKA}/data/ska_testr/test_loads/2019/MAY2019/oflsa/NonLoadTrackedEvents.txt \ + --state-builder=sql \ + --run-start=2019:135 diff --git a/packages/dpa_check/test_regress_head.sh b/packages/dpa_check/test_regress_head.sh new file mode 100644 index 0000000..f96de5d --- /dev/null +++ b/packages/dpa_check/test_regress_head.sh @@ -0,0 +1,4 @@ +dpa_check \ + --outdir=headout \ + --oflsdir=/data/acis/LoadReviews/2018/MAY2818/oflsa \ + --run-start=2018:142 diff --git a/packages/psmc_check/post_check_logs.py b/packages/psmc_check/post_check_logs.py index cb505f8..a04900d 100644 --- a/packages/psmc_check/post_check_logs.py +++ b/packages/psmc_check/post_check_logs.py @@ -4,5 +4,6 @@ allows=['1% quantile value of', '50% quantile value of', '99% quantile value of', - 'in output at out', - 'AstropyDeprecationWarning: out/states.dat already exists.']) + 'validation warning\(s\) in output', + 'AstropyDeprecationWarning: out/states.dat already exists.', + 'AstropyDeprecationWarning: headout/states.dat already exists.']) diff --git a/packages/psmc_check/post_regress.py b/packages/psmc_check/post_regress.py index f47bad7..ce6ba8b 100644 --- a/packages/psmc_check/post_regress.py +++ b/packages/psmc_check/post_regress.py @@ -1,3 +1,4 @@ +import os from testr.packages import make_regress_files regress_files = ['out/index.rst', @@ -5,7 +6,9 @@ 'out/states.dat', 'out/temperatures.dat'] -clean = {'out/index.rst': [(r'^Run time.*', '')], - 'out/run.dat': [(r'#.*py run at.*', '')]} +clean = {'out/index.rst': [(r'^Run time.*', ''), + ('Load directory.*', '')], + 'out/run.dat': [(r'#.*run at.*', ''), + (os.environ['SKA'], '')]} make_regress_files(regress_files, clean=clean) diff --git a/packages/psmc_check/post_regress_head.py b/packages/psmc_check/post_regress_head.py new file mode 100644 index 0000000..c163599 --- /dev/null +++ b/packages/psmc_check/post_regress_head.py @@ -0,0 +1,13 @@ +import os +from testr.packages import make_regress_files + +regress_files = ['headout/index.rst', + 'headout/run.dat', + 'headout/states.dat', + 'headout/temperatures.dat'] + +clean = {'headout/index.rst': [(r'^Run time.*', '')], + 'headout/run.dat': [(r'#.*py run at.*', ''), + (os.environ['SKA'], '')]} + +make_regress_files(regress_files, clean=clean) diff --git a/packages/psmc_check/test_regress.sh b/packages/psmc_check/test_regress.sh index 09accba..9c3cb35 100644 --- a/packages/psmc_check/test_regress.sh +++ b/packages/psmc_check/test_regress.sh @@ -1,4 +1,6 @@ psmc_check \ --outdir=out \ - --oflsdir=/data/acis/LoadReviews/2018/MAY2818/oflsa \ - --run-start=2018:142 + --oflsdir=${SKA}/data/ska_testr/test_loads/2019/MAY2019/oflsa \ + --nlet_file=${SKA}/data/ska_testr/test_loads/2019/MAY2019/oflsa/NonLoadTrackedEvents.txt \ + --state-builder=sql \ + --run-start=2019:135 diff --git a/packages/psmc_check/test_regress_head.sh b/packages/psmc_check/test_regress_head.sh new file mode 100644 index 0000000..6a1665d --- /dev/null +++ b/packages/psmc_check/test_regress_head.sh @@ -0,0 +1,4 @@ +psmc_check \ + --outdir=headout \ + --oflsdir=/data/acis/LoadReviews/2018/MAY2818/oflsa \ + --run-start=2018:142 diff --git a/packages/starcheck/post_regress.py b/packages/starcheck/post_regress.py index a6a446f..a3ff284 100644 --- a/packages/starcheck/post_regress.py +++ b/packages/starcheck/post_regress.py @@ -1,10 +1,11 @@ +import os from testr.packages import make_regress_files regress_files = ['starcheck.txt', - 'starcheck/ccd_temperature.png', - 'starcheck/stars_18125.png', 'starcheck/pcad_att_check.txt'] -clean = {'starcheck.txt': [(r'\s*Run on.*[\n\r]*', '')]} +clean = {'starcheck.txt': [(r'\s*Run on.*[\n\r]*', ''), + (os.environ['SKA'], '')], + 'starcheck/pcad_att_check.txt': [(os.environ['SKA'], '')]} make_regress_files(regress_files, clean=clean) diff --git a/packages/starcheck/test_regress.sh b/packages/starcheck/test_regress.sh index 3676634..5a38970 100644 --- a/packages/starcheck/test_regress.sh +++ b/packages/starcheck/test_regress.sh @@ -1,3 +1 @@ -# Always run flight starcheck, this is not for testing dev starcheck itself. - -${SKA}/bin/starcheck -dir ${SKA}/data/starcheck/test_loads/2016/SEP0516/oflsb +${SKA}/bin/starcheck -dir ${SKA}/data/ska_testr/test_loads/2019/MAY2019/oflsa