aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcslocum <cslocum@d34015c8-bcbb-4646-8ac8-8ba5febf221d>2016-02-19 11:42:10 -0500
committercslocum <cslocum@d34015c8-bcbb-4646-8ac8-8ba5febf221d>2016-02-19 11:42:10 -0500
commit1f6d8f49151b14a723690b7340611a21bb0acd1f (patch)
treeff983b4944ccdb2754b70d87e4286e48c26151b0
parent7c8c6ec271771281a0f41d05debbe7db6ccd3d9c (diff)
downloadsteuermann-1f6d8f49151b14a723690b7340611a21bb0acd1f.tar.gz
Change install to setup and remove all but client test for midday
git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@1471 d34015c8-bcbb-4646-8ac8-8ba5febf221d
-rw-r--r--sm/pandeia.sm8
-rw-r--r--sm/pandeia_midday.sm12
-rw-r--r--sm/pandeia_midday_branch_test.sm12
3 files changed, 10 insertions, 22 deletions
diff --git a/sm/pandeia.sm b/sm/pandeia.sm
index f85902a..ccbeea5 100644
--- a/sm/pandeia.sm
+++ b/sm/pandeia.sm
@@ -3,11 +3,11 @@
TABLE master_installation HOST dljwetcv4
- CMD install_v4 RUN "/etcdata/pandeia/master/run -crash -pull -install"
+ CMD install_v4 RUN "/etcdata/pandeia/master/run -crash -pull -setup"
TABLE master_installation HOST dljwetcv3
- CMD install_v3 RUN "/etcdata/pandeia/master/run -crash -pull -install -start"
+ CMD install_v3 RUN "/etcdata/pandeia/master/run -crash -pull -setup -start"
AFTER *:master_installation/install_v4
@@ -25,12 +25,12 @@ TABLE master_tests HOST dljwetcv3
TABLE branch_test_installation HOST dljwetcv4
- CMD install_v4 RUN "/etcdata/pandeia/branch_test/run -crash -pull-force -install"
+ CMD install_v4 RUN "/etcdata/pandeia/branch_test/run -crash -pull-force -setup"
AFTER *:master_tests/*
TABLE branch_test_installation HOST dljwetcv3
- CMD install_v3 RUN "/etcdata/pandeia/branch_test/run -crash -pull-force -install -start"
+ CMD install_v3 RUN "/etcdata/pandeia/branch_test/run -crash -pull-force -setup -start"
AFTER *:branch_test_installation/install_v4
diff --git a/sm/pandeia_midday.sm b/sm/pandeia_midday.sm
index a22dd4b..6d2d723 100644
--- a/sm/pandeia_midday.sm
+++ b/sm/pandeia_midday.sm
@@ -3,22 +3,16 @@
TABLE master_installation HOST dljwetcv4
- CMD install_v4 RUN "/etcdata/pandeia/master/run -crash -pull -install"
+ CMD install_v4 RUN "/etcdata/pandeia/master/run -crash -pull -setup"
TABLE master_installation HOST dljwetcv3
- CMD install_v3 RUN "/etcdata/pandeia/master/run -crash -pull -install -start"
+ CMD install_v3 RUN "/etcdata/pandeia/master/run -crash -pull -setup -start"
AFTER *:master_installation/install_v4
TABLE master_tests HOST dljwetcv3
- 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_client RUN "/etcdata/pandeia/master/run_tests -client"
- AFTER *:master_tests/test_engine
+ AFTER *:master_installation/*
diff --git a/sm/pandeia_midday_branch_test.sm b/sm/pandeia_midday_branch_test.sm
index 836d768..dedfbbb 100644
--- a/sm/pandeia_midday_branch_test.sm
+++ b/sm/pandeia_midday_branch_test.sm
@@ -3,22 +3,16 @@
TABLE branch_test_installation HOST dljwetcv4
- CMD install_v4 RUN "/etcdata/pandeia/branch_test/run -crash -pull-force -install"
+ CMD install_v4 RUN "/etcdata/pandeia/branch_test/run -crash -pull-force -setup"
TABLE branch_test_installation HOST dljwetcv3
- CMD install_v3 RUN "/etcdata/pandeia/branch_test/run -crash -pull-force -install -start"
+ CMD install_v3 RUN "/etcdata/pandeia/branch_test/run -crash -pull-force -setup -start"
AFTER *:branch_test_installation/install_v4
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_client RUN "/etcdata/pandeia/branch_test/run_tests -client"
- AFTER *:branch_test_tests/test_engine
+ AFTER *:branch_test_installation/*