Merge "Add support for dpdk 17.05"

diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
index de272f5..e8dbea2 100644 (file)
--- a/docker/Dockerfile.aarch64.patch
+++ b/docker/Dockerfile.aarch64.patch
@@ -42,8 +42,8 @@ index 2ee5b4c..23e5ea5 100644
  RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.11.0 python-heatclient==1.11.0
 
 @@ -43,8 +44,8 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-# nginx=5000, rabbitmq=5672
-EXPOSE 5000 5672
+ # nginx=5000, rabbitmq=5672
+ EXPOSE 5000 5672
 
 -ADD http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img ${IMAGE_DIR}
 -ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img ${IMAGE_DIR}

diff --git a/docker/supervisor.sh b/docker/supervisor.sh
index 1e54b41..44e34fb 100755 (executable)
--- a/docker/supervisor.sh
+++ b/docker/supervisor.sh
@@ -11,7 +11,7 @@
 # nginx service start when boot
 supervisor_config='/etc/supervisor/conf.d/yardstick.conf'
 
-if [[ ! -e "${supervisor_config}" ]];then
+if [[ ! -e "${supervisor_config}" ]]; then
     cat << EOF > "${supervisor_config}"
 [supervisord]
 nodaemon = true
@@ -22,8 +22,8 @@ command = service nginx restart
 [program:yardstick_uwsgi]
 directory = /etc/yardstick
 command = uwsgi -i yardstick.ini
-EOF
-fi
 
 [program:rabbitmq]
 command = service rabbitmq-server restart
+EOF
+fi

diff --git a/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-ha_daily.yaml
new file mode 100644 (file)
index 0000000..d5386fd
--- /dev/null
+++ b/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-ha_daily.yaml
@@ -0,0 +1,18 @@
+##############################################################################
+# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+# k8 nosdn nofeature ha daily task suite
+
+schema: "yardstick:suite:0.1"
+
+name: "k8-nosdn-nofeature-ha"
+test_cases_dir: "tests/opnfv/test_cases/"
+test_cases:
+-
+  file_name: opnfv_yardstick_tc080.yaml

diff --git a/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml
index 4fd7659..0ce9455 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml
@@ -15,48 +15,4 @@ name: "k8-nosdn-nofeature-noha"
 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
--
-  file_name: opnfv_yardstick_tc055.yaml
-  constraint:
-      installer: compass
-      pod: huawei-pod1
-  task_args:
-      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5"}'
--
-  file_name: opnfv_yardstick_tc063.yaml
-  constraint:
-      installer: compass
-      pod: huawei-pod1
-  task_args:
-      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5"}'
--
-  file_name: opnfv_yardstick_tc069.yaml
--
-  file_name: opnfv_yardstick_tc070.yaml
--
-  file_name: opnfv_yardstick_tc071.yaml
--
-  file_name: opnfv_yardstick_tc072.yaml
--
-  file_name: opnfv_yardstick_tc075.yaml
-  constraint:
-      installer: compass
-      pod: huawei-pod1
-  task_args:
-      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1"}'
+  file_name: opnfv_yardstick_tc080.yaml