From 26b89ecb973531dfcc0fd30bd50f083e585e1f4f Mon Sep 17 00:00:00 2001 From: Mariusz Wagner Date: Tue, 19 Jun 2018 09:52:01 +0200 Subject: Rename folder for jenkins job Issue-ID: DCAEGEN2-206 Change-Id: Id2414fa53bd7999fbf5ea551bd89e62bb7d72700 Signed-off-by: Mariusz Wagner --- test/csit/plans/dcaegen2/prh-testsuites/setup.sh | 57 ++++++++++++++++++++++ .../csit/plans/dcaegen2/prh-testsuites/teardown.sh | 20 ++++++++ .../plans/dcaegen2/prh-testsuites/testplan.txt | 3 ++ test/csit/plans/dcaegen2/prh_testsuites/setup.sh | 57 ---------------------- .../csit/plans/dcaegen2/prh_testsuites/teardown.sh | 20 -------- .../plans/dcaegen2/prh_testsuites/testplan.txt | 3 -- 6 files changed, 80 insertions(+), 80 deletions(-) create mode 100644 test/csit/plans/dcaegen2/prh-testsuites/setup.sh create mode 100644 test/csit/plans/dcaegen2/prh-testsuites/teardown.sh create mode 100644 test/csit/plans/dcaegen2/prh-testsuites/testplan.txt 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') diff --git a/test/csit/plans/dcaegen2/prh-testsuites/setup.sh b/test/csit/plans/dcaegen2/prh-testsuites/setup.sh new file mode 100644 index 000000000..cdac9d210 --- /dev/null +++ b/test/csit/plans/dcaegen2/prh-testsuites/setup.sh @@ -0,0 +1,57 @@ +#!/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/ + +docker login -u docker -p docker nexus3.onap.org:10003 +docker-compose up -d --build + +# Wait for initialization of Docker containers +for i in {1..50}; do + if [ $(docker inspect --format '{{ .State.Running }}' ${PRH_SERVICE}) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' ${DMAAP_SIMULATOR}) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' ${AAI_SIMULATOR}) ] + then + echo "dmaap_simulator, aai_simulator and prh services are running" + break + else + echo sleep ${i} + sleep ${i} + fi +done + +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 docker services +for i in {1..50}; do + curl -sS -m 1 localhost:2222 && \ + curl -sS -m 1 localhost:3333 && \ + curl -sS -m 1 localhost:8100/heartbeat && break + echo sleep ${i} + sleep ${i} +done + +docker cp prh:/config/prh_endpoints.json ${WORKDIR} +sed -i -e 's/"dmaapHostName":.*/"dmaapHostName": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json +sed -i -e 's/"aaiHost":.*/"aaiHost": "'${AAI_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json +docker cp ${WORKDIR}/prh_endpoints.json prh:/config/ + +#Pass any variables required by Robot test suites in ROBOT_VARIABLES +ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v AAI_SIMULATOR:localhost:3333 -v PRH:localhost:8100" + +pip install docker diff --git a/test/csit/plans/dcaegen2/prh-testsuites/teardown.sh b/test/csit/plans/dcaegen2/prh-testsuites/teardown.sh new file mode 100644 index 000000000..bd1e5ba06 --- /dev/null +++ b/test/csit/plans/dcaegen2/prh-testsuites/teardown.sh @@ -0,0 +1,20 @@ +#!/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 new file mode 100644 index 000000000..9007a64b5 --- /dev/null +++ b/test/csit/plans/dcaegen2/prh-testsuites/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration.git]/test/csit/tests/. +# Place the suites in run order. +dcaegen2/prh-testcases 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 39c1fcef5..000000000 --- a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh +++ /dev/null @@ -1,57 +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/ - -docker login -u docker -p docker nexus3.onap.org:10003 -docker-compose up -d --build - -# Wait for initialization of Docker containers -for i in {1..50}; do - if [ $(docker inspect --format '{{ .State.Running }}' ${PRH_SERVICE}) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' ${DMAAP_SIMULATOR}) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' ${AAI_SIMULATOR}) ] - then - echo "dmaap_simulator, aai_simulator and prh services are running" - break - else - echo sleep ${i} - sleep ${i} - fi -done - -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 docker services -for i in {1..50}; do - curl -sS -m 1 localhost:2222 && \ - curl -sS -m 1 localhost:3333 && \ - curl -sS -m 1 localhost:8100/heartbeat && break - echo sleep ${i} - sleep ${i} -done - -docker cp prh:/config/prh_endpoints.json ${WORKDIR} -sed -i -e 's/"dmaapHostName":.*/"dmaapHostName": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json -sed -i -e 's/"aaiHost":.*/"aaiHost": "'${AAI_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json -docker cp ${WORKDIR}/prh_endpoints.json prh:/config/ - -#Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v AAI_SIMULATOR:localhost:3333 -v PRH:localhost:8100" - -pip install docker 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 8c1f3274a..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