checkpoint; added midday configuration for branch_test_2

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

5 files changed, 46 insertions, 10 deletions

diff --git a/sm/pandeia_midday.sm b/sm/pandeia_midday.sm
index 4f36d6a..e7aa859 100644
--- a/sm/pandeia_midday.sm
+++ b/sm/pandeia_midday.sm
@@ -20,11 +20,11 @@ TABLE master_tests HOST bond
 
 TABLE master_tests HOST dljwetcv3
 
-#    CMD test_server RUN "/etcdata/pandeia/master/run_tests -server"
-#        AFTER *:master_installation/*
+    CMD test_server RUN "/etcdata/pandeia/master/run_tests -server"
+        AFTER *:master_installation/*
 
-#    CMD test_engine RUN "/etcdata/pandeia/master/run_tests -engine"
-#        AFTER *:master_tests/test_server
+    CMD test_engine RUN "/etcdata/pandeia/master/run_tests -engine"
+        AFTER *:master_tests/test_server
 
     CMD test_final RUN "/etcdata/pandeia/master/run_tests -final"
         AFTER OPT *:master_tests/test_server
diff --git a/sm/pandeia_midday_branch_test.sm b/sm/pandeia_midday_branch_test.sm
index 564149d..9a015d6 100644
--- a/sm/pandeia_midday_branch_test.sm
+++ b/sm/pandeia_midday_branch_test.sm
@@ -14,7 +14,8 @@ TABLE branch_test_installation HOST dljwetcv3
 TABLE branch_test_tests HOST bond
 
     CMD test_client RUN "/Users/Shared/pandeia/tests/go branch_test"
-        AFTER *:branch_test_tests/test_engine
+        AFTER *:branch_test_installation/*
+
 
 TABLE branch_test_tests HOST dljwetcv3
 
@@ -25,7 +26,7 @@ TABLE branch_test_tests HOST dljwetcv3
         AFTER *:branch_test_tests/test_server
 
     CMD test_final RUN "/etcdata/pandeia/branch_test/run_tests -final"
-        AFTER *:branch_test_tests/test_client
+        AFTER *:branch_test_tests/test_engine
 
 TABLE test_expected HOST ssb
 
diff --git a/sm/pandeia_midday_branch_test_2.sm b/sm/pandeia_midday_branch_test_2.sm
new file mode 100644
index 0000000..eb3a833
--- /dev/null
+++ b/sm/pandeia_midday_branch_test_2.sm
@@ -0,0 +1,35 @@
+####################
+####################
+
+TABLE branch_test_2_installation HOST dljwetcv8
+
+    CMD install_v8 RUN "/etcdata/pandeia/branch_test_2/run -crash -pull-force -setup"
+
+TABLE branch_test_2_installation HOST dljwetcv7
+
+    CMD install_v7 RUN "/etcdata/pandeia/branch_test_2/run -crash -pull-force -setup -start"
+        AFTER *:branch_test_2_installation/install_v4
+
+
+TABLE branch_test_2_tests HOST bond
+
+    CMD test_client RUN "/Users/Shared/pandeia/tests/go branch_test"
+        AFTER *:branch_test_2_installation/*
+
+
+TABLE branch_test_2_tests HOST dljwetcv7
+
+    CMD test_server RUN "/etcdata/pandeia/branch_test_2/run_tests -server"
+        AFTER *:branch_test_2_installation/*
+
+    CMD test_engine RUN "/etcdata/pandeia/branch_test_2/run_tests -engine"
+        AFTER *:branch_test_2_tests/test_server
+
+    CMD test_final RUN "/etcdata/pandeia/branch_test_2/run_tests -final"
+        AFTER *:branch_test_2_tests/test_engine
+
+
+TABLE test_expected HOST ssb
+
+    CMD expected RUN "/eng/ssb/auto/steuermann_scripts/test_expected etc_jwst_daily"
+        AFTER *:*/*
diff --git a/sm/pyetc_hst.sm b/sm/pyetc_hst.sm
index 5b105ee..77b4259 100644
--- a/sm/pyetc_hst.sm
+++ b/sm/pyetc_hst.sm
@@ -14,8 +14,8 @@ TABLE run_tests HOST etcbrady
     CMD release_ssbdev RUN "/data1/nightly/hst_release_ssbdev/nightly_test_runner -d ssbdev etc_hst_release"
         AFTER release_prod
 
-#    CMD release_new_cdbs RUN "/data1/nightly/hst_release_new_cdbs/nightly_test_runner -d new_cdbs etc_hst_release"
-#        AFTER release_ssbdev
+    CMD release_new_cdbs RUN "/data1/nightly/hst_release_new_cdbs/nightly_test_runner -d new_cdbs etc_hst_release"
+        AFTER release_ssbdev
 
 
 TABLE import_tests HOST ssb
diff --git a/sm/pyetc_hst_midday.sm b/sm/pyetc_hst_midday.sm
index e36bbe7..af1ca88 100644
--- a/sm/pyetc_hst_midday.sm
+++ b/sm/pyetc_hst_midday.sm
@@ -8,13 +8,13 @@ TABLE run_tests HOST etcbrady
 #    CMD bit_prod RUN "/data1/nightly/hst_bit_prod/nightly_test_runner -d production bit"
 #	AFTER OPT dynamic
 
-    CMD release_prod RUN "/data1/nightly/hst_release_prod/nightly_test_runner -d production etc_hst_release"
+#    CMD release_prod RUN "/data1/nightly/hst_release_prod/nightly_test_runner -d production etc_hst_release"
 #        AFTER bit_prod
 
 #    CMD release_ssbdev RUN "/data1/nightly/hst_release_ssbdev/nightly_test_runner -d ssbdev etc_hst_release"
 #        AFTER release_prod
 
-#    CMD release_new_cdbs RUN "/data1/nightly/hst_release_new_cdbs/nightly_test_runner -d new_cdbs etc_hst_release"
+    CMD release_new_cdbs RUN "/data1/nightly/hst_release_new_cdbs/nightly_test_runner -d new_cdbs etc_hst_release"
 #        AFTER release_ssbdev