diff options
23 files changed, 18 insertions, 456 deletions
diff --git a/tests/ci/scp_storperf_admin-rc.sh b/tests/ci/scp_storperf_admin-rc.sh index fd94aaa17..af2885b01 100644 --- a/tests/ci/scp_storperf_admin-rc.sh +++ b/tests/ci/scp_storperf_admin-rc.sh @@ -1,7 +1,5 @@ -#!/usr/bin/expect -set timeout 30 +#!/bin/bash -spawn scp -o StrictHostKeyChecking=no /root/storperf_admin-rc root@192.168.200.1:/root/storperf_admin-rc -expect "root@192.168.200.1's password: " -send "root\r" -interact +ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" +sshpass -p root scp 2>/dev/null $ssh_options ~/storperf_admin-rc \ + root@192.168.200.1:/root/ &> /dev/null diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index 7345e0e5b..eafadf987 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -280,15 +280,17 @@ password = 0pnfv2015 EOF local failed=0 + local start_date + local stop_date if [ ${#SUITE_FILES[@]} -gt 0 ]; then + start_date=$(date '+%Y-%m-%d %H:%M:%S') for suite in ${SUITE_FILES[*]}; do echo "---------------------------" echo "Running test suite: $suite" echo "---------------------------" - if ! yardstick task start --suite $suite; then echo "test suite $suite FAILED"; @@ -306,8 +308,10 @@ EOF echo "Test result file ${DISPATCHER_FILE_NAME} is not exist" fi fi - done + stop_date=$(date '+%Y-%m-%d %H:%M:%S') + + local sceanrio_status="SUCCESS" @@ -316,12 +320,14 @@ EOF fi curl -i -H 'content-type: application/json' -X POST -d \ "{\"project_name\": \"yardstick\", + \"case_name\": \"scenario_status\", \"pod_name\":\"${NODE_NAME}\", \"installer\":\"${INSTALLER_TYPE}\", - \"description\": \"yardstick ci scenario status\", - \"case_name\": \"scenario_status\", \"version\":\"${YARDSTICK_BRANCH}\", \"scenario\":\"${DEPLOY_SCENARIO}\", + \"description\": \"yardstick ci scenario status\", + \"start_date\":\"${start_date}\", + \"stop_date\":\"${stop_date}\", \"details\":\"${sceanrio_status}\"}" \ ${DISPATCHER_HTTP_TARGET} diff --git a/tests/opnfv/test_suites/opnfv_ericsson-pod1_daily.yaml b/tests/opnfv/test_suites/opnfv_ericsson-pod1_daily.yaml deleted file mode 100644 index 66f2f8d98..000000000 --- a/tests/opnfv/test_suites/opnfv_ericsson-pod1_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# ERICSSON POD1 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_ericsson_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_ericsson-pod2_daily.yaml b/tests/opnfv/test_suites/opnfv_ericsson-pod2_daily.yaml deleted file mode 100644 index c420271b8..000000000 --- a/tests/opnfv/test_suites/opnfv_ericsson-pod2_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# ERICSSON POD2 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_ericsson_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_ericsson-virtual1_daily.yaml b/tests/opnfv/test_suites/opnfv_ericsson-virtual1_daily.yaml deleted file mode 100644 index 62a5001ac..000000000 --- a/tests/opnfv/test_suites/opnfv_ericsson-virtual1_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# ERICSSON VIRTUAL1 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_ericsson_virtual1_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-pod1_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod1_daily.yaml deleted file mode 100644 index 35eeb34a7..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-pod1_daily.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# Huawei US bare daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc027.yaml -- - file_name: opnfv_yardstick_tc037.yaml -- - file_name: opnfv_yardstick_tc043.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-pod1_weekly.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod1_weekly.yaml deleted file mode 100644 index 8a9ce4dc0..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-pod1_weekly.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -# Huawei US bare weekly task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_weekly" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc027.yaml -- - file_name: opnfv_yardstick_tc037.yaml -- - file_name: opnfv_yardstick_tc040.yaml -- - file_name: opnfv_yardstick_tc043.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-pod2_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod2_daily.yaml deleted file mode 100644 index 435d21c9e..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-pod2_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei US bare daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-pod3_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod3_daily.yaml deleted file mode 100644 index 5569a0912..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-pod3_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei Shanghai bare daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-pod4_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod4_daily.yaml deleted file mode 100644 index 486425f1b..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-pod4_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ----
-# Huawei Shanghai bare POD6 daily task suite
-
-schema: "yardstick:suite:0.1"
-
-name: "opnfv_huawei_daily"
-test_cases_dir: "tests/opnfv/test_cases/"
-test_cases:
--
- file_name: opnfv_yardstick_tc002.yaml
--
- file_name: opnfv_yardstick_tc005.yaml
--
- file_name: opnfv_yardstick_tc010.yaml
--
- file_name: opnfv_yardstick_tc011.yaml
--
- file_name: opnfv_yardstick_tc012.yaml
--
- file_name: opnfv_yardstick_tc014.yaml
--
- file_name: opnfv_yardstick_tc037.yaml
diff --git a/tests/opnfv/test_suites/opnfv_huawei-virtual1_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual1_daily.yaml deleted file mode 100644 index bb87fc363..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-virtual1_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei US virtual daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-virtual2_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual2_daily.yaml deleted file mode 100644 index bb87fc363..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-virtual2_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei US virtual daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-virtual3_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual3_daily.yaml deleted file mode 100644 index bb87fc363..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-virtual3_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei US virtual daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-virtual4_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual4_daily.yaml deleted file mode 100644 index bb87fc363..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-virtual4_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei US virtual daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_intel-pod2_daily.yaml b/tests/opnfv/test_suites/opnfv_intel-pod2_daily.yaml deleted file mode 100644 index 5191cae7a..000000000 --- a/tests/opnfv/test_suites/opnfv_intel-pod2_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# INTEL POD2 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_intel_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_intel-pod5_daily.yaml b/tests/opnfv/test_suites/opnfv_intel-pod5_daily.yaml deleted file mode 100644 index 824da2d35..000000000 --- a/tests/opnfv/test_suites/opnfv_intel-pod5_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# INTEL POD5 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_intel_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_intel-pod6_daily.yaml b/tests/opnfv/test_suites/opnfv_intel-pod6_daily.yaml deleted file mode 100644 index cf68e64f2..000000000 --- a/tests/opnfv/test_suites/opnfv_intel-pod6_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# INTEL POD6 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_intel_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_intel-pod8_daily.yaml b/tests/opnfv/test_suites/opnfv_intel-pod8_daily.yaml deleted file mode 100644 index 2e626c067..000000000 --- a/tests/opnfv/test_suites/opnfv_intel-pod8_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# INTEL POD8 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_intel_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_lf-pod1_daily.yaml b/tests/opnfv/test_suites/opnfv_lf-pod1_daily.yaml deleted file mode 100644 index 85147a00b..000000000 --- a/tests/opnfv/test_suites/opnfv_lf-pod1_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# LF POD 1 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_lf_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_lf-pod2_daily.yaml b/tests/opnfv/test_suites/opnfv_lf-pod2_daily.yaml deleted file mode 100644 index bda46c026..000000000 --- a/tests/opnfv/test_suites/opnfv_lf-pod2_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# LF POD 2 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_lf_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_orange-pod2_daily.yaml b/tests/opnfv/test_suites/opnfv_orange-pod2_daily.yaml deleted file mode 100644 index 90b52e20c..000000000 --- a/tests/opnfv/test_suites/opnfv_orange-pod2_daily.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# Orange POD2 daily task suite - -schema: "yardstick:suite:0.1" - -name: "orange-pod2_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc001.yaml -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_zte-pod1_daily.yaml b/tests/opnfv/test_suites/opnfv_zte-pod1_daily.yaml deleted file mode 100644 index 2a88f82fb..000000000 --- a/tests/opnfv/test_suites/opnfv_zte-pod1_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# ZTE POD 1 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_zte_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/yardstick/benchmark/scenarios/availability/serviceha.py b/yardstick/benchmark/scenarios/availability/serviceha.py index aee94ee09..10f2c4f45 100755 --- a/yardstick/benchmark/scenarios/availability/serviceha.py +++ b/yardstick/benchmark/scenarios/availability/serviceha.py @@ -66,6 +66,10 @@ class ServiceHA(base.Scenario): LOG.info("monitor stop!") sla_pass = self.monitorMgr.verify_SLA() + if sla_pass: + result['sla_pass'] = 1 + else: + result['sla_pass'] = 0 assert sla_pass is True, "the test cases is not pass the SLA" return |