aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcslocum <cslocum@d34015c8-bcbb-4646-8ac8-8ba5febf221d>2016-06-21 10:46:01 -0400
committercslocum <cslocum@d34015c8-bcbb-4646-8ac8-8ba5febf221d>2016-06-21 10:46:01 -0400
commit6200f0b67e0c67a297f012fb540b4bc253fd832b (patch)
tree77a95bbc3fbe5d216a1e85811fd05a407a11547a
parentc45f08cc274e0f2dc77a5be79b32075ac949dee4 (diff)
downloadsteuermann-6200f0b67e0c67a297f012fb540b4bc253fd832b.tar.gz
add init_db to pandeia installation commands
git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@1508 d34015c8-bcbb-4646-8ac8-8ba5febf221d
-rw-r--r--sm/pandeia.sm35
-rw-r--r--sm/pandeia_midday.sm2
-rw-r--r--sm/pandeia_midday_branch_test.sm2
-rw-r--r--sm/pandeia_midday_branch_test_2.sm2
-rw-r--r--sm/pandeia_midday_branch_test_3.sm2
-rw-r--r--sm/pandeia_midday_master_persistent.sm4
6 files changed, 7 insertions, 40 deletions
diff --git a/sm/pandeia.sm b/sm/pandeia.sm
index d862817..83b5435 100644
--- a/sm/pandeia.sm
+++ b/sm/pandeia.sm
@@ -7,7 +7,7 @@ TABLE master_installation HOST dljwetcv4
TABLE master_installation HOST dljwetcv3
- CMD install_v3 RUN "/etcdata/pandeia/master/run stop pull install start"
+ CMD install_v3 RUN "/etcdata/pandeia/master/run stop pull install init_db start"
AFTER *:master_installation/install_v4
@@ -66,36 +66,3 @@ TABLE test_expected HOST ssb
CMD expected RUN "/eng/ssb/auto/steuermann_scripts/test_expected etc_jwst_daily"
AFTER *:*/*
-
-
-TABLE branch_test_installation HOST dljwetcv4
-
- CMD install_v4 RUN "/etcdata/pandeia/branch_test/run stop pull install"
- AFTER *:master_persistent_tests/*
-
-TABLE branch_test_installation HOST dljwetcv3
-
- CMD install_v3 RUN "/etcdata/pandeia/branch_test/run stop pull install start"
- AFTER *:branch_test_installation/install_v4
-
-
-TABLE branch_test_tests HOST bond
-
- CMD test_client RUN "/Users/Shared/pandeia/tests/go branch_test"
- AFTER *:branch_test_tests/test_engine
-
-TABLE branch_test_tests HOST dljwetcv3
-
- CMD test_server RUN "/etcdata/pandeia/branch_test/run_tests -server"
- AFTER *:branch_test_installation/*
-
- CMD test_engine RUN "/etcdata/pandeia/branch_test/run_tests -engine"
- AFTER *:branch_test_tests/test_server
-
- CMD test_final RUN "/etcdata/pandeia/branch_test/run_tests -final"
- AFTER *:branch_test_tests/test_client
-
-TABLE test_expected HOST ssb
-
- CMD expected RUN "/eng/ssb/auto/steuermann_scripts/test_expected etc_jwst_daily"
- AFTER *:*/*
diff --git a/sm/pandeia_midday.sm b/sm/pandeia_midday.sm
index e29cbbe..b369d1c 100644
--- a/sm/pandeia_midday.sm
+++ b/sm/pandeia_midday.sm
@@ -7,7 +7,7 @@ TABLE master_installation HOST dljwetcv4
TABLE master_installation HOST dljwetcv3
- CMD install_v3 RUN "/etcdata/pandeia/master/run stop pull install start"
+ CMD install_v3 RUN "/etcdata/pandeia/master/run stop pull install init_db start"
AFTER *:master_installation/install_v4
diff --git a/sm/pandeia_midday_branch_test.sm b/sm/pandeia_midday_branch_test.sm
index 61b6588..a56b2fb 100644
--- a/sm/pandeia_midday_branch_test.sm
+++ b/sm/pandeia_midday_branch_test.sm
@@ -7,7 +7,7 @@ TABLE branch_test_installation HOST dljwetcv4
TABLE branch_test_installation HOST dljwetcv3
- CMD install_v3 RUN "/etcdata/pandeia/branch_test/run stop pull install start"
+ CMD install_v3 RUN "/etcdata/pandeia/branch_test/run stop pull install init_db start"
AFTER *:branch_test_installation/install_v4
diff --git a/sm/pandeia_midday_branch_test_2.sm b/sm/pandeia_midday_branch_test_2.sm
index 7095542..4279c81 100644
--- a/sm/pandeia_midday_branch_test_2.sm
+++ b/sm/pandeia_midday_branch_test_2.sm
@@ -7,7 +7,7 @@ TABLE branch_test_2_installation HOST dljwetcv8
TABLE branch_test_2_installation HOST dljwetcv7
- CMD install_v7 RUN "/etcdata/pandeia/branch_test_2/run stop pull install start"
+ CMD install_v7 RUN "/etcdata/pandeia/branch_test_2/run stop pull install init_db start"
AFTER *:branch_test_2_installation/install_v8
diff --git a/sm/pandeia_midday_branch_test_3.sm b/sm/pandeia_midday_branch_test_3.sm
index 90920eb..142b36a 100644
--- a/sm/pandeia_midday_branch_test_3.sm
+++ b/sm/pandeia_midday_branch_test_3.sm
@@ -7,7 +7,7 @@ TABLE branch_test_3_installation HOST dljwetcv8
TABLE branch_test_3_installation HOST dljwetcv7
- CMD install_v7 RUN "/etcdata/pandeia/branch_test_3/run stop pull install start"
+ CMD install_v7 RUN "/etcdata/pandeia/branch_test_3/run stop pull install init_db start"
AFTER *:branch_test_3_installation/install_v8
diff --git a/sm/pandeia_midday_master_persistent.sm b/sm/pandeia_midday_master_persistent.sm
index 04d17b6..34032a3 100644
--- a/sm/pandeia_midday_master_persistent.sm
+++ b/sm/pandeia_midday_master_persistent.sm
@@ -22,8 +22,8 @@ TABLE master_persistent_tests HOST dljwetcv3
CMD test_server RUN "/etcdata/pandeia/master_persistent/run_tests -server"
AFTER *:master_persistent_installation/*
-# CMD test_engine RUN "/etcdata/pandeia/master_persistent/run_tests -engine"
-# AFTER *:master_persistent_tests/test_server
+ CMD test_engine RUN "/etcdata/pandeia/master_persistent/run_tests -engine"
+ AFTER *:master_persistent_tests/test_server
CMD test_final RUN "/etcdata/pandeia/master_persistent/run_tests -final"
AFTER OPT *:master_persistent_tests/test_server