diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-10-23 21:49:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-23 21:49:18 +0000 |
| commit | 97f80c77d52858b2b20484703bb1f235e5fcf393 (patch) | |
| tree | f72bc962fe949ffc15ec64adf77216969d0f0d42 /plans | |
| parent | 52fda040150356d2ce25bc7cdc951db23c4b7beb (diff) | |
| parent | 425ba9232b52ee2d40999526ae792bbf2bf76f55 (diff) | |
Merge "OOF SMS CSIT"
Diffstat (limited to 'plans')
| -rwxr-xr-x | plans/optf-has/has/setup.sh | 3 | ||||
| -rwxr-xr-x | plans/optf-has/has/teardown.sh | 3 | ||||
| -rw-r--r-- | plans/optf-has/osdf/sample.txt | 1 | ||||
| -rwxr-xr-x | plans/optf-osdf/osdf/setup.sh | 3 | ||||
| -rwxr-xr-x | plans/optf-osdf/osdf/teardown.sh | 3 |
5 files changed, 10 insertions, 3 deletions
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 |