aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sm_new/B_dev.sm5
-rw-r--r--sm_new/assemble_common.sm9
-rw-r--r--sm_new/assemble_dev.sm11
-rw-r--r--sm_new/cdbs.sm8
-rw-r--r--sm_new/init.sm4
-rwxr-xr-xsm_new/install2
-rw-r--r--sm_new/nightly_setup.sm15
-rw-r--r--sm_new/pdk_ok.sm10
-rw-r--r--sm_new/test_common.sm11
-rw-r--r--sm_new/test_dev.sm67
-rw-r--r--sm_new/test_x.sm4
11 files changed, 77 insertions, 69 deletions
diff --git a/sm_new/B_dev.sm b/sm_new/B_dev.sm
deleted file mode 100644
index 8464322..0000000
--- a/sm_new/B_dev.sm
+++ /dev/null
@@ -1,5 +0,0 @@
-IMPORT "init.sm"
-IMPORT "assemble_common.sm"
-IMPORT "assemble_dev.sm"
-IMPORT "build_dev.sm"
-IMPORT "dist_dev.sm"
diff --git a/sm_new/assemble_common.sm b/sm_new/assemble_common.sm
index 03f36db..46c6b15 100644
--- a/sm_new/assemble_common.sm
+++ b/sm_new/assemble_common.sm
@@ -1,10 +1,7 @@
-####################
-####################
-
# arzach assembles all the source code
TABLE assemble HOST arzach
- CMD svnsync RUN "assemble_svnsync"
- AFTER init/*
- AFTER OPT irafx_update
+ CMD svnsync RUN "assemble_svnsync"
+ AFTER init/*
+ AFTER OPT irafx_update
diff --git a/sm_new/assemble_dev.sm b/sm_new/assemble_dev.sm
index 0d32c8b..089a834 100644
--- a/sm_new/assemble_dev.sm
+++ b/sm_new/assemble_dev.sm
@@ -2,28 +2,23 @@
TABLE assemble HOST arzach
CMD dev.stsci_python RUN "assemble_stsci_python dev"
- AFTER init/*
AFTER svnsync
CMD dev.stsci_iraf RUN "assemble_stsci_iraf dev"
- AFTER init/*
AFTER svnsync
CMD dev.axe RUN "assemble_axe dev"
- AFTER init/*
AFTER svnsync
CMD dev.hstcal RUN "assemble_hstcal dev"
- AFTER init/*
AFTER svnsync
+
TABLE assemble HOST jwcalibdev
CMD dev.jwst RUN "assemble_jwst dev"
- AFTER init/*
- AFTER *:svnsync
+ AFTER *:assemble/svnsync
# CMD dev.crds RUN "assemble_crds dev"
-# AFTER init/*
-# AFTER svnsync
+# AFTER *:assemble/svnsync
diff --git a/sm_new/cdbs.sm b/sm_new/cdbs.sm
index a4f5dcf..ecc15c9 100644
--- a/sm_new/cdbs.sm
+++ b/sm_new/cdbs.sm
@@ -1,3 +1,7 @@
+TABLE cdbs HOST arzach
+ CMD ftp RUN "cdbs_arc"
+ AFTER init/*
+
TABLE cdbs HOST cadeau banana
CMD local_copy RUN "cdbs_copy"
AFTER init/*
@@ -6,8 +10,4 @@ TABLE cdbs HOST cadeau
CMD mac_package RUN "/Users/iraf/daily_build/mac_package/make_packages cdbs"
AFTER cdbs/local_copy
-TABLE cdbs HOST arzach
- CMD ftp RUN "cdbs_arc"
- AFTER init/*
-
diff --git a/sm_new/init.sm b/sm_new/init.sm
index 0966019..09d33e4 100644
--- a/sm_new/init.sm
+++ b/sm_new/init.sm
@@ -1,10 +1,14 @@
TABLE init HOST banana bond cadeau arzach herbert ssb jwcalibdev etcbrady etccartier
+
CMD sendscripts LOCAL "/eng/ssb/auto/steuermann_scripts/init_sendscripts %(hostname)s %(workdir)s"
+
CMD sysstat RUN "sysstat"
AFTER sendscripts
#TABLE init HOST vxp-dukat
+#
# CMD sendscripts LOCAL "/eng/ssb/auto/steuermann_scripts/init_sendscripts_windows %(hostname)s %(workdir)s"
+#
# CMD sysstat RUN "sysstat_windows"
# AFTER sendscripts
diff --git a/sm_new/install b/sm_new/install
index a65f004..8d71343 100755
--- a/sm_new/install
+++ b/sm_new/install
@@ -3,7 +3,7 @@
# su iraf -c ./install
#
-N=13
+N=14
here=`pwd`
diff --git a/sm_new/nightly_setup.sm b/sm_new/nightly_setup.sm
new file mode 100644
index 0000000..8f176a7
--- /dev/null
+++ b/sm_new/nightly_setup.sm
@@ -0,0 +1,15 @@
+IMPORT "init.sm"
+IMPORT "cdbs.sm"
+IMPORT "pdk_ok.sm"
+IMPORT "assemble_common.sm"
+IMPORT "assemble_dev.sm"
+
+
+TABLE setup_done HOST banana bond cadeau arzach herbert ssb jwcalibdev etcbrady etccartier
+
+ CMD done LOCAL "echo all done with setup"
+ AFTER init/*
+ AFTER OPT cdbs/*
+ AFTER OPT pdk_ok/*
+ AFTER OPT assemble/*
+
diff --git a/sm_new/pdk_ok.sm b/sm_new/pdk_ok.sm
new file mode 100644
index 0000000..8131980
--- /dev/null
+++ b/sm_new/pdk_ok.sm
@@ -0,0 +1,10 @@
+
+TABLE pdk_ok HOST ssb
+
+ CMD process_okify_tables RUN "/eng/ssb/auto/steuermann_scripts/process_okify_tables"
+ AFTER *:init/*
+
+TABLE pdk_ok HOST arzach cadeau banana herbert
+
+ CMD okify RUN "test_okify"
+ AFTER ssb:pdk_ok/process_okify_tables
diff --git a/sm_new/test_common.sm b/sm_new/test_common.sm
deleted file mode 100644
index 7a3fbbd..0000000
--- a/sm_new/test_common.sm
+++ /dev/null
@@ -1,11 +0,0 @@
-
-TABLE process_okify_tables HOST ssb
- CMD pdk_ok RUN "/eng/ssb/auto/steuermann_scripts/process_okify_tables"
- AFTER *:init/*
-
-TABLE test_setup HOST arzach cadeau banana herbert
- CMD okify RUN "test_okify"
- AFTER *:process_okify_tables/*
-
-# each of test_run_* says AFTER test_setup/*
-
diff --git a/sm_new/test_dev.sm b/sm_new/test_dev.sm
index 23e7b67..312b6b6 100644
--- a/sm_new/test_dev.sm
+++ b/sm_new/test_dev.sm
@@ -1,44 +1,51 @@
-####################
-####################
-
-IMPORT "test_common.sm"
-
-
# This structure is meant to serialize the regtests so that nothing else
# is going on at the same time. The regtests can consume all the CPUs.
TABLE test_run_dev HOST arzach cadeau banana # herbert
- CMD test2.7.3 RUN "test_rt dev 2.7.3"
- AFTER stamp/dev
- AFTER test_setup/okify
- AFTER test_setup/*
+
+ CMD test2.7.3 RUN "test_rt dev 2.7.3"
+ AFTER stamp/dev
+ AFTER pdk_ok/*
+
TABLE test_run_dev HOST arzach
- CMD test2.6.5 RUN "test_rt dev 2.6.5"
- AFTER stamp/dev
- AFTER test2.7.*
+
+ CMD test2.6.5 RUN "test_rt dev 2.6.5"
+ AFTER stamp/dev
+ AFTER test2.7.*
+
TABLE test_run_dev HOST arzach
- CMD contact RUN "test_contact"
- AFTER stamp/dev
- AFTER test2.7.*
+
+ CMD contact RUN "test_contact"
+ AFTER stamp/dev
+ AFTER test2.7.*
+
TABLE test_run_dev HOST jwcalibdev
- CMD contact_jwst RUN "test_contact_jwst"
- AFTER init/*
- AFTER test2.7.*
+
+ CMD contact_jwst RUN "test_contact_jwst"
+ AFTER init/*
+ AFTER test2.7.*
+
TABLE test_run_dev HOST jwcalibdev
- CMD jwst RUN "/data1/jwst_rt/rt dev 2.7.3"
- AFTER stamp/dev
+
+ CMD jwst RUN "/data1/jwst_rt/rt dev 2.7.3"
+ AFTER stamp/dev
+
TABLE test_import HOST ssb
- CMD dev.import RUN "test_import irafdev"
- AFTER *:test_run_dev/*
- AFTER *:pyetc/*
- CMD dev.expect RUN "test_expected irafdev daily_latest daily"
- AFTER test_import/dev.import
- CMD dev.jwst.import RUN "test_import jwst"
- AFTER jwcalibdev:test_run_dev/jwst
- CMD dev.jwst.expect RUN "test_expected jwst jwst_latest dailyjwst"
- AFTER dev.jwst.import
+
+ CMD dev.import RUN "test_import irafdev"
+ AFTER *:test_run_dev/*
+ AFTER *:pyetc/*
+
+ CMD dev.expect RUN "test_expected irafdev daily_latest daily"
+ AFTER test_import/dev.import
+
+ CMD dev.jwst.import RUN "test_import jwst"
+ AFTER jwcalibdev:test_run_dev/jwst
+
+ CMD dev.jwst.expect RUN "test_expected jwst jwst_latest dailyjwst"
+ AFTER dev.jwst.import
diff --git a/sm_new/test_x.sm b/sm_new/test_x.sm
index bde2aef..ca324f3 100644
--- a/sm_new/test_x.sm
+++ b/sm_new/test_x.sm
@@ -1,7 +1,3 @@
-####################
-####################
-IMPORT "test_common.sm"
-
# This structure is meant to serialize the regtests so that nothing else
# is going on at the same time. The regtests can consume all the CPUs.
TABLE test_run_x HOST arzach cadeau banana herbert
generated by cgit (git 2.34.1) at 2025-05-04 18:16:53 -0400