diff options
| -rw-r--r-- | sm/A_x.sm | 11 | ||||
| -rw-r--r-- | sm/A_xb.sm | 11 | ||||
| -rw-r--r-- | sm/A_xd.sm | 2 | ||||
| -rw-r--r-- | sm/B_x.sm | 5 | ||||
| -rw-r--r-- | sm/build_x.sm | 27 | ||||
| -rw-r--r-- | sm/test_common.sm | 13 | ||||
| -rw-r--r-- | sm/test_dev.sm | 10 | ||||
| -rw-r--r-- | sm/test_import.sm | 12 | ||||
| -rw-r--r-- | sm/test_x.sm | 14 |
9 files changed, 34 insertions, 71 deletions
diff --git a/sm/A_x.sm b/sm/A_x.sm deleted file mode 100644 index 217f77d..0000000 --- a/sm/A_x.sm +++ /dev/null @@ -1,11 +0,0 @@ -IMPORT "B_x.sm" -IMPORT "test_x.sm" - -TABLE assemble HOST arzach - CMD irafx_update RUN "/eng/ssb/auto/prog/irafx_update " - AFTER init/* - - CMD irafx_age RUN "/eng/ssb/auto/prog/irafx_age.py" - AFTER irafx_update - AFTER OPT svnsync - @@ -1,2 +1,11 @@ -IMPORT "B_x.sm" +IMPORT "init.sm" +IMPORT "assemble_common.sm" +IMPORT "assemble_x.sm" +IMPORT "build_x.sm" + IMPORT "test_x.sm" + +TABLE assemble HOST arzach + CMD irafx_update RUN "/eng/ssb/auto/prog/irafx_update " + AFTER init/* + diff --git a/sm/A_xd.sm b/sm/A_xd.sm new file mode 100644 index 0000000..e9f1ceb --- /dev/null +++ b/sm/A_xd.sm @@ -0,0 +1,2 @@ +IMPORT "dist_x.sm" + diff --git a/sm/B_x.sm b/sm/B_x.sm deleted file mode 100644 index a0183a7..0000000 --- a/sm/B_x.sm +++ /dev/null @@ -1,5 +0,0 @@ -IMPORT "init.sm" -IMPORT "assemble_common.sm" -IMPORT "assemble_x.sm" -IMPORT "build_x.sm" -IMPORT "dist_x.sm" diff --git a/sm/build_x.sm b/sm/build_x.sm index 43377f7..574db25 100644 --- a/sm/build_x.sm +++ b/sm/build_x.sm @@ -4,33 +4,6 @@ #################### #################### -# arzach assembles all the source code -TABLE assemble HOST arzach - - CMD svnsync RUN "assemble_svnsync" - AFTER init/* - AFTER OPT irafx_update - - CMD x.stsci_python RUN "assemble_stsci_python x" - AFTER init/* - AFTER svnsync - - CMD x.stsci_iraf RUN "assemble_stsci_iraf x" - AFTER init/* - AFTER svnsync - - CMD x.axe RUN "assemble_axe x" - AFTER init/* - AFTER svnsync - - CMD x.hstcal RUN "assemble_hstcal x" - AFTER init/* - AFTER svnsync - - -#################### -#################### - # install stsci_python into default environment # build hstcal # - everywhere diff --git a/sm/test_common.sm b/sm/test_common.sm index 50b04cf..47bffa6 100644 --- a/sm/test_common.sm +++ b/sm/test_common.sm @@ -1,16 +1,11 @@ TABLE test_setup HOST herbert thor arzach bond cadeau banana CMD okify RUN "test_okify" - AFTER distribute/* + AFTER init/* # each of test_run_* says AFTER test_setup/* TABLE test_final HOST ssb - CMD import RUN "test_import daily" - AFTER *:test_run_*/* - CMD notify RUN "test_notify daily" - AFTER import - CMD sqlite_watch RUN "test_sqlite_watch" - AFTER import CMD mysql_watch RUN "test_mysql_watch" - AFTER import - + AFTER OPT dev.import + AFTER OPT x.import + AFTER init/* diff --git a/sm/test_dev.sm b/sm/test_dev.sm index 7d2b7ea..14830fe 100644 --- a/sm/test_dev.sm +++ b/sm/test_dev.sm @@ -8,16 +8,26 @@ IMPORT "test_common.sm" # is going on at the same time. The regtests can consume all the CPUs. TABLE test_run_dev HOST herbert thor arzach bond cadeau banana CMD test2.7 RUN "test_rt dev 2.7" + AFTER stamp/dev AFTER test_setup/okify AFTER test_setup/* TABLE test_run_dev HOST arzach CMD test2.6 RUN "test_rt dev 2.6" + AFTER stamp/dev AFTER test2.7 CMD test2.5 RUN "test_rt dev 2.5" + AFTER stamp/dev AFTER test2.6 TABLE test_run_dev HOST thor CMD contact RUN "test_contact" + AFTER stamp/dev AFTER test2.7 +TABLE test_final HOST ssb + CMD dev.import RUN "test_import daily" + AFTER *:test_run_dev/* + CMD dev.notify RUN "test_notify daily" + AFTER dev.import + diff --git a/sm/test_import.sm b/sm/test_import.sm deleted file mode 100644 index 6238aba..0000000 --- a/sm/test_import.sm +++ /dev/null @@ -1,12 +0,0 @@ -#################### -#################### - -TABLE test_finale HOST ssb - CMD dev.import RUN "test_import daily" - AFTER *:test_run_*/* - CMD dev.notify RUN "test_notify daily" - AFTER dev.import - CMD dev.sqlite_watch RUN "test_sqlite_watch" - AFTER dev.import - CMD dev.mysql_watch RUN "test_mysql_watch" - AFTER dev.import diff --git a/sm/test_x.sm b/sm/test_x.sm index be22da3..51c85ca 100644 --- a/sm/test_x.sm +++ b/sm/test_x.sm @@ -6,17 +6,19 @@ IMPORT "test_common.sm" # is going on at the same time. The regtests can consume all the CPUs. TABLE test_run_x HOST herbert thor arzach bond cadeau banana CMD test2.7 RUN "test_rt x 2.7" + AFTER stamp/x AFTER test_setup/okify AFTER test_setup/* AFTER OPT test_run_dev/* -TABLE test_run_x HOST arzach - CMD test2.6 RUN "test_rt x 2.6" - AFTER test2.7 - CMD test2.5 RUN "test_rt x 2.5" - AFTER test2.6 - TABLE test_run_x HOST thor CMD contact RUN "test_contact" + AFTER stamp/x AFTER test2.7 +TABLE test_final HOST ssb + CMD x.import RUN "test_import daily" + AFTER *:test_run_x/* + CMD x.notify RUN "test_notify daily" + AFTER x.import + |