diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2021-09-13 07:51:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-09-13 07:51:38 +0000 |
| commit | 85321a52e56422c1bb552c10387d27066decee84 (patch) | |
| tree | 283882cb3ee2aee750cc1bf165358e811812b4de /plans | |
| parent | 2ec1675ae61a690a4284620246c08adfe04633e9 (diff) | |
| parent | 532cd635c7ad5561657b2a64d423aad611969b66 (diff) | |
Merge "Update DFC tests to use file based conifg"istanbul
Diffstat (limited to 'plans')
| -rw-r--r-- | plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh | 3 | ||||
| -rw-r--r-- | plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh index e85c0eea..2dc7e945 100644 --- a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh +++ b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh @@ -22,6 +22,9 @@ else echo "Using SIM_ROOT from environmental variable: " $SIM_ROOT fi +#Prepare DFC config volume +mkdir $SIM_ROOT/simulator-group/dfc_config_volume || true + #Location of the above simulators when run as a group. For start+config and stop. SIMGROUP_ROOT=$SIM_ROOT/simulator-group diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh index 81d85fe5..c05f3561 100644 --- a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh +++ b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh @@ -5,6 +5,8 @@ running_images=$(docker images -q) docker exec dfc_app0 cat /var/log/ONAP/application.log >> $WORKSPACE/archives/dfc_app0_application.log docker logs dfc_mr-sim >> $WORKSPACE/archives/dfc_mr-sim.log +rm -rf $SIM_ROOT/simulator-group/dfc_config_volume || true + if [ -z "$running_containers" ] then echo "No container requires termination" |