Adjust DCAE-DS CSIT for Jenkins and to master

 - directory structures of DCAE-DS CSIT plans, scripts and tests
   have been changed to be more compatible with jjb templates to
   enable working Jenkins jobs
 - robot tests adjusted to latest changes in robotframework-onap library

Change-Id: Id05602a88557267cc7ae77f066877680ae431a7f
Issue-ID: SDC-2365
Signed-off-by: kaihlavi <l.kaihlavirt@partner.samsung.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/plans/sdc/dcaed/setup.sh b/plans/sdc-dcae-d/dcaed/setup.sh
index 074b8c05..5a94a939 100644
--- a/plans/sdc/dcaed/setup.sh
+++ b/plans/sdc-dcae-d/dcaed/setup.sh
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-source ${WORKSPACE}/scripts/sdc/setup_sdc_dcaed.sh
+source ${WORKSPACE}/scripts/sdc-dcae-d/setup_sdc_dcaed.sh
diff --git a/plans/sdc/dcaed/teardown.sh b/plans/sdc-dcae-d/dcaed/teardown.sh
index 911273c2..2467d1e9 100644
--- a/plans/sdc/dcaed/teardown.sh
+++ b/plans/sdc-dcae-d/dcaed/teardown.sh
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-source ${WORKSPACE}/scripts/sdc/cleanup_sdc_dcaed.sh
+source ${WORKSPACE}/scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh
diff --git a/plans/sdc/dcaed/testplan.txt b/plans/sdc-dcae-d/dcaed/testplan.txt
index a1313f18..63a4cda4 100644
--- a/plans/sdc/dcaed/testplan.txt
+++ b/plans/sdc-dcae-d/dcaed/testplan.txt
@@ -1,3 +1,3 @@
 # Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
-sdc/dcaed
+sdc-dcae-d/dcaed