comleted test_x.sm and dist_x.sm

git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@1138 d34015c8-bcbb-4646-8ac8-8ba5febf221d

4 files changed, 58 insertions, 135 deletions

diff --git a/sm_new/dist_x.sm b/sm_new/dist_x.sm
index 64cb731..e124c3b 100644
--- a/sm_new/dist_x.sm
+++ b/sm_new/dist_x.sm
@@ -1,117 +1,21 @@
 
-# we can make everything after this
+TABLE distribute HOST nott
 
-TABLE x_distribute HOST herbert arzach bond cadeau banana
-	CMD gate RUN "exit 0"
-		AFTER init/*
-		AFTER stamp/*
+    IF ssbx_dist:
+    CMD sync_ssbx RUN "synctool - ssbx"
+        AFTER nott:test_x/install_x
 
-# regular distributions
+    IF ssbx_dist:
+    CMD sync_envconfig RUN "synctool - envconfig.mac"
+        AFTER sync_ssbx
 
-TABLE x_distribute HOST arzach
-	CMD x.iraf RUN "synctool - irafx"
-		AFTER x_distribute/gate
-	CMD x.pyssg RUN "synctool - pyssgx"
-		AFTER x_distribute/gate
-	CMD x.stsci_iraf RUN "synctool - stsci_iraf_x"
-		AFTER x_distribute/gate
-	CMD x.hstcal RUN "synctool - hstcalx"
-		AFTER x_distribute/gate
-	CMD x.motd RUN "synctool - irafx/iraf/unix/hlib/motd"
-		AFTER x_distribute/x.iraf
+    # push ssbx /eng/ssb/src/ssbx_pending
+    # to /eng/ssb/websites/ssbpublic/ureka/x
+    IF ssbx_dist:
+    CMD push_ssbx_to_web RUN "synctool - envconfig.mac"
+        AFTER nott:test_x/install_x
+    
 
-#
 
-TABLE x_distribute HOST cadeau banana
-	CMD irafx.pkg RUN "cd $HOME/daily_build/mac_package; ./build x " 
-		AFTER x_distribute/gate
-	CMD irafx.dmg RUN "cd $HOME/daily_build/mac_package; ./distribute x -" 
-		AFTER irafx.pkg
 
-# wads of special cases
-
-# jwcalibdev has local disk - some day it may do its own builds
-TABLE x_distribute HOST arzach
-	CMD x.jwcalibdev.iraf RUN "synctool jwcalibdev: irafx"
-		AFTER x_distribute/gate
-	CMD x.jwcalibdev.pyssg RUN "synctool jwcalibdev: pyssgx"
-		AFTER x_distribute/gate
-	CMD x.jwcalibdev.stsci_iraf RUN "synctool jwcalibdev: stsci_iraf_x"
-		AFTER x_distribute/gate
-	CMD x.jwcalibdev.hstcal RUN "synctool jwcalibdev: hstcalx"
-		AFTER x_distribute/gate
-	CMD x.jwcalibdev.motd RUN "synctool jwcalibdev: irafx/iraf/unix/hlib/motd"
-		AFTER x.jwcalibdev.iraf
-
-# web distribution
-
-TABLE x_distribute HOST cadeau
-	CMD x.web RUN "do_irafx_web"
-		AFTER x_distribute/gate
-		AFTER *:x_distribute/irafx.pkg
-		AFTER *:x_distribute/irafx.dmg
-
-TABLE x_distribute HOST herbert
-	CMD x.web RUN "do_irafx_web S"
-		AFTER x_distribute/gate
-		AFTER cadeau:x_distribute/x.web
-		AFTER *:x_distribute/irafx.pkg
-		AFTER *:x_distribute/irafx.dmg
-
-
-# goods - has RHE 5 only now
-
-TABLE x_distribute_other HOST arzach
-	CMD goods.iraf RUN "synctool goods12: irafx"
-		AFTER x_distribute/gate
-	CMD goods.pyssg RUN "synctool goods12: pyssgx"
-		AFTER x_distribute/gate
-	CMD goods.stsci_iraf RUN "synctool goods12: stsci_iraf_x"
-		AFTER x_distribute/gate
-	CMD goods.hstcal RUN "synctool goods12: hstcalx"
-		AFTER x_distribute/gate
-	CMD goods.motd RUN "synctool goods12: irafx/iraf/unix/hlib/motd"
-		AFTER goods.iraf
-
-# witserv1 - who are these guys?
-
-TABLE x_distribute_other HOST arzach
-	CMD witserv1.iraf RUN "synctool witserv1: irafx"
-		AFTER x_distribute/gate
-	CMD witserv1.pyssg RUN "synctool witserv1: pyssgx"
-		AFTER x_distribute/gate
-	CMD witserv1.stsci_iraf RUN "synctool witserv1: stsci_iraf_x"
-		AFTER x_distribute/gate
-	CMD witserv1.hstcal RUN "synctool witserv1: hstcalx"
-		AFTER x_distribute/gate
-	CMD witserv1.motd RUN "synctool witserv1: irafx/iraf/unix/hlib/motd"
-		AFTER witserv1.iraf
-
-# dmsinsvm - have a pipeline and irafx/irafdev on the same machine for INS
-
-TABLE x_distribute_other HOST arzach
-	CMD dmsinsvm.iraf RUN "synctool dmsinsvm: irafx"
-		AFTER x_distribute/gate
-	CMD dmsinsvm.pyssg RUN "synctool dmsinsvm: pyssgx"
-		AFTER x_distribute/gate
-	CMD dmsinsvm.stsci_iraf RUN "synctool dmsinsvm: stsci_iraf_x"
-		AFTER x_distribute/gate
-	CMD dmsinsvm.hstcal RUN "synctool dmsinsvm: hstcalx"
-		AFTER x_distribute/gate
-	CMD dmsinsvm.motd RUN "synctool dmsinsvm: irafx/iraf/unix/hlib/motd"
-		AFTER dmsinsvm.iraf
-
-# royal - a beowulf cluster
-
-TABLE x_distribute_other HOST arzach
-	CMD royal.iraf RUN "synctool royal: irafx"
-		AFTER x_distribute/gate
-	CMD royal.pyssg RUN "synctool royal: pyssgx"
-		AFTER x_distribute/gate
-	CMD royal.stsci_iraf RUN "synctool royal: stsci_iraf_x"
-		AFTER x_distribute/gate
-	CMD royal.hstcal RUN "synctool royal: hstcalx"
-		AFTER x_distribute/gate
-	CMD royal.motd RUN "synctool royal: irafx/iraf/unix/hlib/motd"
-		AFTER royal.iraf
 
diff --git a/sm_new/nightly.sm b/sm_new/nightly.sm
index e622cf2..0ab4b4b 100644
--- a/sm_new/nightly.sm
+++ b/sm_new/nightly.sm
@@ -1,7 +1,7 @@
 IMPORT "init.sm"
 
 IMPORT "test_dev.sm"
-#IMPORT "test_x.sm"
+IMPORT "test_x.sm"
 
 IMPORT "dist_dev.sm"
-#IMPORT "dist_x.sm"
+IMPORT "dist_x.sm"
diff --git a/sm_new/pdk_ok.sm b/sm_new/pdk_ok.sm
index 5b8ee1b..502840d 100644
--- a/sm_new/pdk_ok.sm
+++ b/sm_new/pdk_ok.sm
@@ -3,7 +3,7 @@ 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
+TABLE pdk_ok HOST arzach cadeau banana herbert nott
 
     CMD okify RUN "test_okify"
         AFTER ssb:pdk_ok/process_okify_tables
diff --git a/sm_new/test_x.sm b/sm_new/test_x.sm
index b1f66b4..b9db478 100644
--- a/sm_new/test_x.sm
+++ b/sm_new/test_x.sm
@@ -1,24 +1,43 @@
-# TODO
-# - install Ureka x on test machines
-
-
-# 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
-	CMD test2.7.3 RUN "test_rt x 2.7.3"
-		AFTER stamp/x
-		AFTER test_setup/okify
-		AFTER test_setup/*
-		AFTER OPT test_run_dev/*
-
-TABLE test_run_x HOST arzach
-	CMD contact RUN "test_contact"
-		AFTER stamp/x
-		AFTER test2.7.*
-
-TABLE test_import HOST ssb
-        CMD x.import RUN "test_import irafx"
-                AFTER *:test_run_x/*
-        CMD x.expect RUN "test_expected irafx daily_latest daily"
-                AFTER test_import/x.import
+
+TABLE test_x HOST nott
+
+    IF ssbx_test:
+    CMD install_x RUN "install_ssb_ureka x"
+        AFTER init/*
+
+#    IF ssbx_test:
+#    CMD jwst_contact RUN "test_contact_jwst"
+#        AFTER install_x
+
+#    IF ssbx_test:
+#    CMD jwst_test RUN "/srv/jwst_rt/rt x"
+#        AFTER jwst_contact
+
+    IF ssbx_test:
+    CMD test2.7.5 RUN "test_rt x 2.7.5"
+        AFTER OPT jwst_test
+        AFTER install_x
+
+    IF ssbx_test:
+    CMD contact RUN "test_contact"
+        AFTER test2.7.5
+
+
+TABLE import_test_results HOST ssb
+
+#    IF ssbx_test:
+#    CMD x.jwst.import RUN "test_import jwst"
+#        AFTER nott:test_x/jwst_test
+
+#    IF ssbx_test:
+#    CMD x.jwst.expect RUN "test_expected jwst jwst_latest dailyjwst"
+#        AFTER x.jwst.import
+
+    IF ssbx_test:
+    CMD x.import RUN "test_import irafx"
+        AFTER nott:test_x/*
+
+    IF ssbx_test:
+    CMD x.expect RUN "test_expected irafx daily_latest daily"
+        AFTER x.import