From 2d3d8dcf6ef1bd2a161c69d561c629c5ec3f59c4 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 27 Sep 2018 10:29:30 -0700 Subject: Move CSIT to integration/csit repo To facilite branching of CSIT tests, all CSIT test code and scripts are relocated to the integration/csit repo. Change-Id: I6777cd414e43dbf2bfa6215f7e50849e1a6a2e59 Issue-ID: INT-671 Signed-off-by: Gary Wu --- test/csit/plans/dcaegen2/prh-testsuites/setup.sh | 36 ---------------------- .../csit/plans/dcaegen2/prh-testsuites/teardown.sh | 20 ------------ .../plans/dcaegen2/prh-testsuites/testplan.txt | 3 -- 3 files changed, 59 deletions(-) delete mode 100644 test/csit/plans/dcaegen2/prh-testsuites/setup.sh delete mode 100644 test/csit/plans/dcaegen2/prh-testsuites/teardown.sh delete mode 100644 test/csit/plans/dcaegen2/prh-testsuites/testplan.txt (limited to 'test/csit/plans/dcaegen2/prh-testsuites') diff --git a/test/csit/plans/dcaegen2/prh-testsuites/setup.sh b/test/csit/plans/dcaegen2/prh-testsuites/setup.sh deleted file mode 100644 index 52167bf5c..000000000 --- a/test/csit/plans/dcaegen2/prh-testsuites/setup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -source ${SCRIPTS}/common_functions.sh - -export PRH_SERVICE="prh" -export DMAAP_SIMULATOR="dmaap_simulator" -export AAI_SIMULATOR="aai_simulator" - -cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/resources/ - -pip uninstall -y docker-py -pip uninstall -y docker -pip install -U docker -docker-compose up -d --build - -PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${PRH_SERVICE}) -DMAAP_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${DMAAP_SIMULATOR}) -AAI_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${AAI_SIMULATOR}) - -bypass_ip_adress ${PRH_IP} -bypass_ip_adress ${DMAAP_SIMULATOR_IP} -bypass_ip_adress ${AAI_SIMULATOR_IP} - -echo PRH_IP=${PRH_IP} -echo DMAAP_SIMULATOR_IP=${DMAAP_SIMULATOR_IP} -echo AAI_SIMULATOR_IP=${AAI_SIMULATOR_IP} - -# Wait for initialization of PRH services -for i in {1..10}; do - curl -sS -m 1 localhost:8100/heartbeat && break - echo sleep ${i} - sleep ${i} -done - -# #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DMAAP_SIMULATOR:${DMAAP_SIMULATOR_IP}:2222 -v AAI_SIMULATOR:${AAI_SIMULATOR_IP}:3333 -v PRH:${PRH_IP}:8100" diff --git a/test/csit/plans/dcaegen2/prh-testsuites/teardown.sh b/test/csit/plans/dcaegen2/prh-testsuites/teardown.sh deleted file mode 100644 index bd1e5ba06..000000000 --- a/test/csit/plans/dcaegen2/prh-testsuites/teardown.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 Nokia, Inc. and others. -# -# 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. -# - -kill-instance.sh prh -kill-instance.sh dmaap_simulator -kill-instance.sh aai_simulator diff --git a/test/csit/plans/dcaegen2/prh-testsuites/testplan.txt b/test/csit/plans/dcaegen2/prh-testsuites/testplan.txt deleted file mode 100644 index 9007a64b5..000000000 --- a/test/csit/plans/dcaegen2/prh-testsuites/testplan.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Test suites are relative paths under [integration.git]/test/csit/tests/. -# Place the suites in run order. -dcaegen2/prh-testcases -- cgit 1.2.3-korg