From c420d631cfe0d1c60d028d9baf5f7ced1429d934 Mon Sep 17 00:00:00 2001 From: vrvarma Date: Thu, 26 Mar 2020 11:46:50 -0400 Subject: Fix optf has and osdf csit failures CSIT jobs are failing with the latest aaf-sms docker images. Change-Id: Ia7da218d7383ad87cd59b07171a1931cad85f6c7 Signed-off-by: vrvarma Issue-ID: OPTFRA-725 --- plans/optf-has/has/setup.sh | 2 +- plans/optf-has/has/teardown.sh | 3 ++- plans/optf-osdf/osdf/setup.sh | 2 +- plans/optf-osdf/osdf/teardown.sh | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'plans') diff --git a/plans/optf-has/has/setup.sh b/plans/optf-has/has/setup.sh index 593a6867..db3ec7c7 100755 --- a/plans/optf-has/has/setup.sh +++ b/plans/optf-has/has/setup.sh @@ -15,7 +15,7 @@ # limitations under the License. # echo "# aaf-sms setup.sh script"; -source ${WORKSPACE}/plans/aaf/sms-test-plan/setup.sh +source ${WORKSPACE}/scripts/optf-has/has/setup-sms.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 477c7ed2..0b2b6299 100755 --- a/plans/optf-has/has/teardown.sh +++ b/plans/optf-has/has/teardown.sh @@ -33,5 +33,6 @@ 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 +kill-instance.sh sms +kill-instance.sh vault diff --git a/plans/optf-osdf/osdf/setup.sh b/plans/optf-osdf/osdf/setup.sh index d2d45af5..42e9aecf 100755 --- a/plans/optf-osdf/osdf/setup.sh +++ b/plans/optf-osdf/osdf/setup.sh @@ -20,7 +20,7 @@ # echo "# aaf-sms setup.sh script"; -source ${WORKSPACE}/plans/aaf/sms-test-plan/setup.sh +source ${WORKSPACE}/scripts/optf-osdf/osdf/setup-sms.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 cae8dcca..3457295d 100755 --- a/plans/optf-osdf/osdf/teardown.sh +++ b/plans/optf-osdf/osdf/teardown.sh @@ -31,5 +31,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 +kill-instance.sh sms +kill-instance.sh vault -- cgit 1.2.3-korg