From 47a5ec38616b40414911ac9bf1a955b04d78e598 Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Thu, 12 Apr 2018 11:29:30 -0700 Subject: Fold SO func. tests into integration-testing plan PTL of SO asked for a consolodated job for function testing rather than individual features each with their own jobs. This patch puts SO testing plans under so/integration-testing and points to santiy-check in testplans.txt. Issue-ID: SO-555 Change-Id: I89f36f25c0bc3879702c6148d2858c99de7120e0 Signed-off-by: Marcus G K Williams --- test/csit/plans/so/integration-testing/setup.sh | 38 ++++++++++++++++++++++ test/csit/plans/so/integration-testing/teardown.sh | 19 +++++++++++ .../csit/plans/so/integration-testing/testplan.txt | 3 ++ test/csit/plans/so/sanity-check/setup.sh | 38 ---------------------- test/csit/plans/so/sanity-check/teardown.sh | 19 ----------- test/csit/plans/so/sanity-check/testplan.txt | 3 -- 6 files changed, 60 insertions(+), 60 deletions(-) create mode 100644 test/csit/plans/so/integration-testing/setup.sh create mode 100644 test/csit/plans/so/integration-testing/teardown.sh create mode 100644 test/csit/plans/so/integration-testing/testplan.txt delete mode 100644 test/csit/plans/so/sanity-check/setup.sh delete mode 100644 test/csit/plans/so/sanity-check/teardown.sh delete mode 100644 test/csit/plans/so/sanity-check/testplan.txt (limited to 'test/csit/plans') diff --git a/test/csit/plans/so/integration-testing/setup.sh b/test/csit/plans/so/integration-testing/setup.sh new file mode 100644 index 000000000..cd0cbdc33 --- /dev/null +++ b/test/csit/plans/so/integration-testing/setup.sh @@ -0,0 +1,38 @@ +#!/bin/bash +# +# Copyright 2016-2017 Huawei Technologies 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. +# +# Place the scripts in run order: +# Start all process required for executing test case + +#start mariadb +docker run -d --name mariadb -h db.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password -p 3306:3306 -v ${WORKSPACE}/test/csit/scripts/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d -v ${WORKSPACE}/test/csit/scripts/mariadb/conf.d:/etc/mysql/conf.d nexus3.onap.org:10001/mariadb + +#start so +docker run -d --name so -h mso.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password --link=mariadb:db.mso.testlab.openecomp.org -p 8080:8080 -v ${WORKSPACE}/test/csit/scripts/so/chef-config:/shared nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest + + +SO_IP=`get-instance-ip.sh so` +# Wait for initialization +for i in {1..10}; do + curl -sS ${SO_IP}:1080 && break + echo sleep $i + sleep $i +done + +#REPO_IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' so` +REPO_IP='127.0.0.1' +# Pass any variables required by Robot test suites in ROBOT_VARIABLES +ROBOT_VARIABLES="-v REPO_IP:${REPO_IP}" diff --git a/test/csit/plans/so/integration-testing/teardown.sh b/test/csit/plans/so/integration-testing/teardown.sh new file mode 100644 index 000000000..1696c745c --- /dev/null +++ b/test/csit/plans/so/integration-testing/teardown.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# Copyright 2016-2017 Huawei Technologies 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. +# + +kill-instance.sh mariadb +kill-instance.sh so diff --git a/test/csit/plans/so/integration-testing/testplan.txt b/test/csit/plans/so/integration-testing/testplan.txt new file mode 100644 index 000000000..761c75c03 --- /dev/null +++ b/test/csit/plans/so/integration-testing/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration.git]/test/csit/tests/. +# Place the suites in run order. +so/sanity-check/sanity_test_so.robot \ No newline at end of file diff --git a/test/csit/plans/so/sanity-check/setup.sh b/test/csit/plans/so/sanity-check/setup.sh deleted file mode 100644 index cd0cbdc33..000000000 --- a/test/csit/plans/so/sanity-check/setup.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies 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. -# -# Place the scripts in run order: -# Start all process required for executing test case - -#start mariadb -docker run -d --name mariadb -h db.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password -p 3306:3306 -v ${WORKSPACE}/test/csit/scripts/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d -v ${WORKSPACE}/test/csit/scripts/mariadb/conf.d:/etc/mysql/conf.d nexus3.onap.org:10001/mariadb - -#start so -docker run -d --name so -h mso.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password --link=mariadb:db.mso.testlab.openecomp.org -p 8080:8080 -v ${WORKSPACE}/test/csit/scripts/so/chef-config:/shared nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest - - -SO_IP=`get-instance-ip.sh so` -# Wait for initialization -for i in {1..10}; do - curl -sS ${SO_IP}:1080 && break - echo sleep $i - sleep $i -done - -#REPO_IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' so` -REPO_IP='127.0.0.1' -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v REPO_IP:${REPO_IP}" diff --git a/test/csit/plans/so/sanity-check/teardown.sh b/test/csit/plans/so/sanity-check/teardown.sh deleted file mode 100644 index 1696c745c..000000000 --- a/test/csit/plans/so/sanity-check/teardown.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies 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. -# - -kill-instance.sh mariadb -kill-instance.sh so diff --git a/test/csit/plans/so/sanity-check/testplan.txt b/test/csit/plans/so/sanity-check/testplan.txt deleted file mode 100644 index 761c75c03..000000000 --- a/test/csit/plans/so/sanity-check/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. -so/sanity-check/sanity_test_so.robot \ No newline at end of file -- cgit 1.2.3-korg