From 425ba9232b52ee2d40999526ae792bbf2bf76f55 Mon Sep 17 00:00:00 2001 From: Dileep Ranganathan Date: Thu, 4 Oct 2018 15:34:34 -0700 Subject: OOF SMS CSIT Added CSIT support for HAS and OSDF with SMS Bring up dependencies like sms service and related containers Preload secrets Removed clear text secrets from config files Deleted unused osdf folders inside has folders. osdf uses separate folders now. Change-Id: Ie534e13b87a98de9f3ab1ed0be66f5f699353d93 Issue-ID: OPTFRA-343 Signed-off-by: Dileep Ranganathan --- plans/optf-has/has/setup.sh | 3 ++- plans/optf-has/has/teardown.sh | 3 +++ plans/optf-has/osdf/sample.txt | 1 - plans/optf-osdf/osdf/setup.sh | 3 +++ plans/optf-osdf/osdf/teardown.sh | 3 ++- 5 files changed, 10 insertions(+), 3 deletions(-) delete mode 100644 plans/optf-has/osdf/sample.txt (limited to 'plans') diff --git a/plans/optf-has/has/setup.sh b/plans/optf-has/has/setup.sh index 6f0e8836..593a6867 100755 --- a/plans/optf-has/has/setup.sh +++ b/plans/optf-has/has/setup.sh @@ -14,7 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # - +echo "# aaf-sms setup.sh script"; +source ${WORKSPACE}/plans/aaf/sms-test-plan/setup.sh # # add here eventual scripts needed for music diff --git a/plans/optf-has/has/teardown.sh b/plans/optf-has/has/teardown.sh index 934d0e69..477c7ed2 100755 --- a/plans/optf-has/has/teardown.sh +++ b/plans/optf-has/has/teardown.sh @@ -32,3 +32,6 @@ source ${WORKSPACE}/scripts/optf-has/has/simulator_teardown_script.sh echo "# optf/has music scripts calling"; source ${WORKSPACE}/scripts/optf-has/has/music_teardown_script.sh +echo "# aaf-sms teardown.sh script"; +source ${WORKSPACE}/plans/aaf/sms-test-plan/teardown.sh + diff --git a/plans/optf-has/osdf/sample.txt b/plans/optf-has/osdf/sample.txt deleted file mode 100644 index 9f4e8d7d..00000000 --- a/plans/optf-has/osdf/sample.txt +++ /dev/null @@ -1 +0,0 @@ -#test diff --git a/plans/optf-osdf/osdf/setup.sh b/plans/optf-osdf/osdf/setup.sh index 771423ca..d2d45af5 100755 --- a/plans/optf-osdf/osdf/setup.sh +++ b/plans/optf-osdf/osdf/setup.sh @@ -19,6 +19,9 @@ # # +echo "# aaf-sms setup.sh script"; +source ${WORKSPACE}/plans/aaf/sms-test-plan/setup.sh + echo "# simulator scripts calling"; source ${WORKSPACE}/scripts/optf-osdf/osdf/simulator_script.sh diff --git a/plans/optf-osdf/osdf/teardown.sh b/plans/optf-osdf/osdf/teardown.sh index 144ce266..cae8dcca 100755 --- a/plans/optf-osdf/osdf/teardown.sh +++ b/plans/optf-osdf/osdf/teardown.sh @@ -30,5 +30,6 @@ kill-instance.sh optf-osdf kill-instance.sh osdf_sim - +echo "# aaf-sms teardown.sh script"; +source ${WORKSPACE}/plans/aaf/sms-test-plan/teardown.sh -- cgit 1.2.3-korg