summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Kunz <georg.kunz@ericsson.com>2018-04-02 20:45:17 +0200
committerDan Xu <xudan16@huawei.com>2018-04-08 08:35:40 +0000
commitde58a1bd6d908aefc8461c866901e64c12454c8b (patch)
tree296b9d43c6c77df018c5b7eedc2ca44c0a3d4bc9
parent83850ddcd3f5d4be8ea9f411a0a09e52a1354f0e (diff)
Removing outdated patch for Yardstick HA tests
This patch was needed to modify the timeout values of the HA test cases in Yardstick for the Danube release. In Euphrates, the timeout values have been fixed upstream, so the patch is not needed anymore. The code for applying the patch was already removed in https://gerrit.opnfv.org/gerrit/#/c/51997/ Change-Id: I67cceb57c063378d77f6cbc720bc6464d2be4aed Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
-rw-r--r--etc/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch133
1 files changed, 0 insertions, 133 deletions
diff --git a/etc/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch b/etc/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch
deleted file mode 100644
index 8c9589ca..00000000
--- a/etc/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From b7c13b5a7e07abdf4d3631049625461271fa5c5b Mon Sep 17 00:00:00 2001
-From: cvp <cvp@example.com>
-Date: Tue, 26 Sep 2017 03:59:54 +0000
-Subject: [PATCH] Adjust Yardstick HA test cases SLA and log level
-
----
- tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml | 4 ++--
- tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml | 4 ++--
- tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml | 4 ++--
- tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml | 4 ++--
- tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml | 4 ++--
- tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml | 4 ++--
- yardstick/__init__.py | 2 +-
- 7 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
-index 5d3057d..c1d3645 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
-@@ -34,10 +34,10 @@ scenarios:
- - monitor_type: "process"
- process_name: "nova-api"
- host: node1
-- monitor_time: 20
-+ monitor_time: 30
- monitor_number: 3
- sla:
-- max_recover_time: 20
-+ max_recover_time: 30
-
- nodes:
- node1: node1.LF
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
-index d851d5a..8c7348b 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
-@@ -33,10 +33,10 @@ scenarios:
- - monitor_type: "process"
- process_name: "neutron-server"
- host: node1
-- monitor_time: 20
-+ monitor_time: 30
- monitor_number: 3
- sla:
-- max_recover_time: 20
-+ max_recover_time: 30
-
- nodes:
- node1: node1.LF
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
-index ad81a14..635e4d9 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
-@@ -33,10 +33,10 @@ scenarios:
- - monitor_type: "process"
- process_name: "keystone"
- host: node1
-- monitor_time: 20
-+ monitor_time: 30
- monitor_number: 3
- sla:
-- max_recover_time: 20
-+ max_recover_time: 30
-
- nodes:
- node1: node1.LF
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
-index cc99036..57fa739 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
-@@ -33,10 +33,10 @@ scenarios:
- - monitor_type: "process"
- process_name: "glance-api"
- host: node1
-- monitor_time: 20
-+ monitor_time: 30
- monitor_number: 3
- sla:
-- max_recover_time: 20
-+ max_recover_time: 30
-
- nodes:
- node1: node1.LF
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
-index 237f845..06ad641 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
-@@ -33,10 +33,10 @@ scenarios:
- - monitor_type: "process"
- process_name: "cinder-api"
- host: node1
-- monitor_time: 20
-+ monitor_time: 30
- monitor_number: 3
- sla:
-- max_recover_time: 20
-+ max_recover_time: 30
-
- nodes:
- node1: node1.LF
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
-index 9e05cc8..e3f0934 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
-@@ -32,10 +32,10 @@ scenarios:
- key: "service-status"
- process_name: "haproxy"
- host: node1
-- monitor_time: 20
-+ monitor_time: 30
- monitor_number: 3
- sla:
-- max_recover_time: 20
-+ max_recover_time: 30
-
- -
- monitor_type: "openstack-cmd"
-diff --git a/yardstick/__init__.py b/yardstick/__init__.py
-index 2f5ae9f..973bfa2 100644
---- a/yardstick/__init__.py
-+++ b/yardstick/__init__.py
-@@ -44,7 +44,7 @@ def _init_logging():
- _LOG_STREAM_HDLR.setLevel(logging.INFO)
- # don't append to log file, clobber
- _LOG_FILE_HDLR.setFormatter(_LOG_FORMATTER)
-- _LOG_FILE_HDLR.setLevel(logging.DEBUG)
-+ _LOG_FILE_HDLR.setLevel(logging.INFO)
-
- del logging.root.handlers[:]
- logging.root.addHandler(_LOG_STREAM_HDLR)
---
-1.9.1
-