diff options
| -rw-r--r-- | sm_new/dist_dev.sm | 87 | ||||
| -rw-r--r-- | sm_new/nightly.sm | 2 | ||||
| -rw-r--r-- | sm_new/nightly_conditions.sm | 2 | ||||
| -rw-r--r-- | sm_new/test_dev.sm | 42 |
4 files changed, 29 insertions, 104 deletions
diff --git a/sm_new/dist_dev.sm b/sm_new/dist_dev.sm index 791bbda..3df95d8 100644 --- a/sm_new/dist_dev.sm +++ b/sm_new/dist_dev.sm @@ -1,84 +1,11 @@ -# TODO -# rsync Ureka from /usr/stsci on nott to /ustsciEWS6_x64 on redhat-srvr4 +TABLE distribute HOST nott + IF ssbdev_dist: + CMD sync_ssbdev RUN "synctool - ssbdev" + AFTER nott:test_dev/install_dev -# regular distributions - -TABLE distribute HOST arzach - CMD dev.iraf RUN "synctool - irafdev" - AFTER stamp/dev - CMD dev.pyssg RUN "synctool - pyssgdev" - AFTER stamp/dev - CMD dev.stsci_iraf RUN "synctool - stsci_iraf_dev" - AFTER stamp/dev - CMD dev.hstcal RUN "synctool - hstcaldev" - AFTER stamp/dev - CMD dev.motd RUN "synctool - irafdev/iraf/unix/hlib/motd" - AFTER distribute/dev.iraf - -TABLE distribute HOST cadeau banana - CMD irafdev.pkg RUN "cd $HOME/daily_build/mac_package; ./build dev " AFTER stamp/dev - CMD irafdev.dmg RUN "cd $HOME/daily_build/mac_package; ./distribute dev -" AFTER irafdev.pkg - -# wads of special cases - -# goods - has RHE 5 only now - -TABLE distribute_other HOST arzach - CMD goods.iraf RUN "synctool goods12: irafdev" - AFTER stamp/dev - CMD goods.pyssg RUN "synctool goods12: pyssgdev" - AFTER stamp/dev - CMD goods.stsci_iraf RUN "synctool goods12: stsci_iraf_dev" - AFTER stamp/dev - CMD goods.hstcal RUN "synctool goods12: hstcaldev" - AFTER stamp/dev - CMD goods.motd RUN "synctool goods12: irafdev/iraf/unix/hlib/motd" - AFTER goods.iraf - -# witserv1 - who are these guys? - -TABLE distribute_other HOST arzach - CMD witserv1.iraf RUN "synctool witserv1: irafdev" - AFTER stamp/dev - CMD witserv1.pyssg RUN "synctool witserv1: pyssgdev" - AFTER stamp/dev - CMD witserv1.stsci_iraf RUN "synctool witserv1: stsci_iraf_dev" - AFTER stamp/dev - CMD witserv1.hstcal RUN "synctool witserv1: hstcaldev" - AFTER stamp/dev - CMD witserv1.motd RUN "synctool witserv1: irafdev/iraf/unix/hlib/motd" - AFTER witserv1.iraf - -# dmsinsvm - have a pipeline and irafx/irafdev on the same machine for INS -# -# dmsinsvm shares a disk with the real DMS systems. There is not -# currently space for irafdev. - -# TABLE distribute_other HOST arzach -# CMD dmsinsvm.iraf RUN "synctool dmsinsvm: irafdev" -# AFTER stamp/dev -# CMD dmsinsvm.pyssg RUN "synctool dmsinsvm: pyssgdev" -# AFTER stamp/dev -# CMD dmsinsvm.stsci_iraf RUN "synctool dmsinsvm: stsci_iraf_dev" -# AFTER stamp/dev -# CMD dmsinsvm.hstcal RUN "synctool dmsinsvm: hstcaldev" -# AFTER stamp/dev -# CMD dmsinsvm.motd RUN "synctool dmsinsvm: irafdev/iraf/unix/hlib/motd" -# AFTER dmsinsvm.iraf - -# royal - a beowulf cluster - -TABLE distribute_other HOST arzach - CMD royal.iraf RUN "synctool royal: irafdev" - AFTER stamp/dev - CMD royal.pyssg RUN "synctool royal: pyssgdev" - AFTER stamp/dev - CMD royal.stsci_iraf RUN "synctool royal: stsci_iraf_dev" - AFTER stamp/dev - CMD royal.hstcal RUN "synctool royal: hstcaldev" - AFTER stamp/dev - CMD royal.motd RUN "synctool royal: irafdev/iraf/unix/hlib/motd" - AFTER royal.iraf + IF ssbdev_dist: + CMD sync_envconfig RUN "synctool - envconfig.mac" + AFTER sync_ssbdev diff --git a/sm_new/nightly.sm b/sm_new/nightly.sm index 0efd030..e622cf2 100644 --- a/sm_new/nightly.sm +++ b/sm_new/nightly.sm @@ -3,5 +3,5 @@ IMPORT "init.sm" IMPORT "test_dev.sm" #IMPORT "test_x.sm" -#IMPORT "dist_dev.sm" +IMPORT "dist_dev.sm" #IMPORT "dist_x.sm" diff --git a/sm_new/nightly_conditions.sm b/sm_new/nightly_conditions.sm index 4b9a2de..d2b77de 100644 --- a/sm_new/nightly_conditions.sm +++ b/sm_new/nightly_conditions.sm @@ -1,7 +1,9 @@ CONDITIONS ssbdev_build = False + ssbdev_test = False ssbdev_dist = False ssbx_build = False + ssbx_test = False ssbx_dist = False END diff --git a/sm_new/test_dev.sm b/sm_new/test_dev.sm index 3a2771f..48701eb 100644 --- a/sm_new/test_dev.sm +++ b/sm_new/test_dev.sm @@ -1,46 +1,42 @@ -# TODO -# install Ureka into /usr/stsci on nott -# call "install_ssb_ureka dev" -# run tests - TABLE test_dev HOST nott - IF ssbdev_build: + IF ssbdev_test: CMD install_dev RUN "install_ssb_ureka dev" AFTER init/* - IF ssbdev_build: - CMD jwst_contact RUN "test_contact_jwst" - AFTER install_dev +# IF ssbdev_test: +# CMD jwst_contact RUN "test_contact_jwst" +# AFTER install_dev - IF ssbdev_build: - CMD jwst_test RUN "/srv/jwst_rt/rt dev" - AFTER jwst_contact +# IF ssbdev_test: +# CMD jwst_test RUN "/srv/jwst_rt/rt dev" +# AFTER jwst_contact - IF ssbdev_build: + IF ssbdev_test: CMD test2.7.5 RUN "test_rt dev 2.7.5" AFTER jwst_test + IF ssbdev_test: CMD contact RUN "test_contact" AFTER test2.7.5 TABLE import_test_results HOST ssb - IF ssbdev_build: +# IF ssbdev_test: +# CMD dev.jwst.import RUN "test_import jwst" +# AFTER nott:test_dev/jwst_test + +# IF ssbdev_test: +# CMD dev.jwst.expect RUN "test_expected jwst jwst_latest dailyjwst" +# AFTER dev.jwst.import + + IF ssbdev_test: CMD dev.import RUN "test_import irafdev" AFTER nott:test_dev/* - IF ssbdev_build: + IF ssbdev_test: CMD dev.expect RUN "test_expected irafdev daily_latest daily" AFTER dev.import - IF ssbdev_build: - CMD dev.jwst.import RUN "test_import jwst" - AFTER nott:test_dev/jwst_test - - IF ssbdev_build: - CMD dev.jwst.expect RUN "test_expected jwst jwst_latest dailyjwst" - AFTER dev.jwst.import - |