From f8b8352acaada6f679555de2cd9e1c0c75a24b76 Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Sun, 1 Oct 2017 21:03:05 +0300 Subject: SDC test rename and timeouts increase Rename healthCheck test to sanity test Change-Id: Id24e18ef7b22592d7315de2ef992d59199bd2d6a Issue-Id: SDC-424 Signed-off-by: Yuli Shlosberg --- test/csit/plans/sdc/healthCheck/setup.sh | 37 ---------------------------- test/csit/plans/sdc/healthCheck/teardown.sh | 22 ----------------- test/csit/plans/sdc/healthCheck/testplan.txt | 3 --- test/csit/plans/sdc/sanity/setup.sh | 37 ++++++++++++++++++++++++++++ test/csit/plans/sdc/sanity/teardown.sh | 22 +++++++++++++++++ test/csit/plans/sdc/sanity/testplan.txt | 3 +++ 6 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 test/csit/plans/sdc/healthCheck/setup.sh delete mode 100644 test/csit/plans/sdc/healthCheck/teardown.sh delete mode 100644 test/csit/plans/sdc/healthCheck/testplan.txt create mode 100644 test/csit/plans/sdc/sanity/setup.sh create mode 100644 test/csit/plans/sdc/sanity/teardown.sh create mode 100644 test/csit/plans/sdc/sanity/testplan.txt (limited to 'test/csit/plans') diff --git a/test/csit/plans/sdc/healthCheck/setup.sh b/test/csit/plans/sdc/healthCheck/setup.sh deleted file mode 100644 index 3e4e66024..000000000 --- a/test/csit/plans/sdc/healthCheck/setup.sh +++ /dev/null @@ -1,37 +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. -# -# Modifications copyright (c) 2017 AT&T Intellectual Property -# -# Place the scripts in run order: - - -source ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh - -source ${WORKSPACE}/test/csit/scripts/sdc/start_sdc_containers.sh - -source ${WORKSPACE}/test/csit/scripts/sdc/docker_health.sh - -source ${WORKSPACE}/test/csit/scripts/sdc/start_sdc_sanity.sh - - -BE_IP=`get-instance-ip.sh sdc-BE` -echo BE_IP=${BE_IP} - - -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v BE_IP:${BE_IP}" - diff --git a/test/csit/plans/sdc/healthCheck/teardown.sh b/test/csit/plans/sdc/healthCheck/teardown.sh deleted file mode 100644 index a5f69819e..000000000 --- a/test/csit/plans/sdc/healthCheck/teardown.sh +++ /dev/null @@ -1,22 +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. -# -# Modifications copyright (c) 2017 AT&T Intellectual Property -# - -source ${WORKSPACE}/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh - -# $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging diff --git a/test/csit/plans/sdc/healthCheck/testplan.txt b/test/csit/plans/sdc/healthCheck/testplan.txt deleted file mode 100644 index 2b2db1ede..000000000 --- a/test/csit/plans/sdc/healthCheck/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. -sdc/healthCheck diff --git a/test/csit/plans/sdc/sanity/setup.sh b/test/csit/plans/sdc/sanity/setup.sh new file mode 100644 index 000000000..3e4e66024 --- /dev/null +++ b/test/csit/plans/sdc/sanity/setup.sh @@ -0,0 +1,37 @@ +#!/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. +# +# Modifications copyright (c) 2017 AT&T Intellectual Property +# +# Place the scripts in run order: + + +source ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh + +source ${WORKSPACE}/test/csit/scripts/sdc/start_sdc_containers.sh + +source ${WORKSPACE}/test/csit/scripts/sdc/docker_health.sh + +source ${WORKSPACE}/test/csit/scripts/sdc/start_sdc_sanity.sh + + +BE_IP=`get-instance-ip.sh sdc-BE` +echo BE_IP=${BE_IP} + + +# Pass any variables required by Robot test suites in ROBOT_VARIABLES +ROBOT_VARIABLES="-v BE_IP:${BE_IP}" + diff --git a/test/csit/plans/sdc/sanity/teardown.sh b/test/csit/plans/sdc/sanity/teardown.sh new file mode 100644 index 000000000..a5f69819e --- /dev/null +++ b/test/csit/plans/sdc/sanity/teardown.sh @@ -0,0 +1,22 @@ +#!/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. +# +# Modifications copyright (c) 2017 AT&T Intellectual Property +# + +source ${WORKSPACE}/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh + +# $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging diff --git a/test/csit/plans/sdc/sanity/testplan.txt b/test/csit/plans/sdc/sanity/testplan.txt new file mode 100644 index 000000000..801f37d38 --- /dev/null +++ b/test/csit/plans/sdc/sanity/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration.git]/test/csit/tests/. +# Place the suites in run order. +sdc/sanity -- cgit 1.2.3-korg