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>

2 files changed, 0 insertions, 99 deletions

diff --git a/scripts/sdc/cleanup_sdc_dcaed.sh b/scripts/sdc/cleanup_sdc_dcaed.sh
deleted file mode 100644
index 35cbc7be..00000000
--- a/scripts/sdc/cleanup_sdc_dcaed.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2019 © Samsung Electronics Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# Note! This is only temporary solution for killing SDC DCAE plugin's
-# docker containers that must be currently used whenever docker_run.sh is used
-# with -dcae option - See SDC-2338 for related image naming issue
-#
-# DCAE plugin-related parts will also have to be refactored under dedicated
-# directories in the future
-#
-
-echo "This is ${WORKSPACE}/scripts/sdc/cleanup_sdc_dcaed.sh"
-
-cp -rf ${WORKSPACE}/data/logs/ ${WORKSPACE}/archives/
-
-ls -Rt ${WORKSPACE}/archives/
-
-#kill and remove all sdc dockers
-docker stop $(docker ps -a -q --filter="name=sdc")
-docker rm $(docker ps -a -q --filter="name=sdc")
-# kill and remove all sdc dcae dockers
-docker stop $(docker ps -a -q --filter="name=dcae")
-docker rm $(docker ps -a -q --filter="name=dcae")
-
-#delete data folder
-
-sudo rm -rf ${WORKSPACE}/data/*
diff --git a/scripts/sdc/setup_sdc_dcaed.sh b/scripts/sdc/setup_sdc_dcaed.sh
deleted file mode 100644
index e0d0cc28..00000000
--- a/scripts/sdc/setup_sdc_dcaed.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2019 © Samsung Electronics Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-set -x
-
-echo "This is ${WORKSPACE}/scripts/sdc/setup_sdc_dcaed.sh"
-
-# Clone sdc enviroment template
-mkdir -p ${WORKSPACE}/data/environments/
-mkdir -p ${WORKSPACE}/data/clone/
-cd ${WORKSPACE}/data/clone
-git clone --depth 1 http://gerrit.onap.org/r/sdc/dcae-d/dt-be-main
-git clone --depth 1 http://gerrit.onap.org/r/sdc
-
-chmod -R 777 ${WORKSPACE}/data/clone
-
-# set enviroment variables
-
-export ENV_NAME='CSIT'
-export MR_IP_ADDR='10.0.0.1'
-export TEST_SUITE=$1
-
-ifconfig
-IP_ADDRESS=`ip route get 8.8.8.8 | awk '/src/{ print $7 }'`
-export HOST_IP=$IP_ADDRESS
-
-# setup enviroment json
-
-cat ${WORKSPACE}/data/clone/sdc/sdc-os-chef/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > ${WORKSPACE}/data/environments/$ENV_NAME.json
-
-source ${WORKSPACE}/data/clone/sdc/version.properties
-export RELEASE=$major.$minor-STAGING-latest
-source ${WORKSPACE}/data/clone/dt-be-main/version.properties
-export DCAE_RELEASE=$major.$minor-STAGING-latest
-export DEP_ENV=$ENV_NAME
-
-cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc/
-cp ${WORKSPACE}/data/clone/dt-be-main/docker/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc/dcaed_docker_run.sh
-
-${WORKSPACE}/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001
-${WORKSPACE}/scripts/sdc/dcaed_docker_run.sh -r ${DCAE_RELEASE} -e ${ENV_NAME} -p 10001
-
-