Merge "ipv6 testcase disable port-security on vRouter"

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644 (file)
index 59dbef0..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB 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
-##############################################################################
-
-FROM ubuntu:14.04
-MAINTAINER Hans Feldt <hans.feldt@ericsson.com>
-
-# TODO: Is there some easy way to get the fastest/closest mirror?
-#RUN sed -i 's/archive.ubuntu.com/ftp.acc.umu.se/g' /etc/apt/sources.list
-
-RUN apt-get update && apt-get install -y \
-    libffi-dev \
-    libssl-dev \
-    libxml2-dev \
-    libxslt1-dev \
-    python \
-    python-dev \
-    python-setuptools && \
-    easy_install -U setuptools
-
-COPY . /tmp/yardstick
-
-RUN cd /tmp/yardstick && \
-    python setup.py install && \
-    apt-get -y remove \
-        binutils \
-        cpp \
-        gcc \
-        libffi-dev \
-        libssl-dev \
-        python3 \
-        python-dev && \
-    apt-get -y autoremove && \
-    apt-get clean && \
-    useradd -u 65500 -m yardstick && \
-    cp -a samples /home/yardstick && \
-    chown -R yardstick /home/yardstick/samples && \
-    chgrp -R yardstick /home/yardstick/samples && \
-    rm -rf /tmp/* && \
-    rm -rf /var/lib/apt/lists/*
-
-USER yardstick
-CMD bash --login
-ENV HOME /home/yardstick
-WORKDIR /home/yardstick

diff --git a/tests/ci/docker/yardstick-ci/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from tests/ci/docker/yardstick-ci/Dockerfile
rename to docker/Dockerfile

diff --git a/tests/ci/docker/Makefile b/docker/Makefile
similarity index 100%
rename from tests/ci/docker/Makefile
rename to docker/Makefile

diff --git a/tests/ci/docker/yardstick-ci/exec_tests.sh b/docker/exec_tests.sh
similarity index 100%
rename from tests/ci/docker/yardstick-ci/exec_tests.sh
rename to docker/exec_tests.sh

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index 9c949ec..130969f 100755 (executable)
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -96,25 +96,29 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
     sshpass -p r00tme ssh 2>/dev/null $ssh_options \
         root@${INSTALLER_IP} fuel node>fuel_node
 
+    # update fuel node id and ip info according to the CI env
+    controller_IDs=($(cat fuel_node|grep controller|awk '{print $1}'))
+    compute_IDs=($(cat fuel_node|grep compute|awk '{print $1}'))
     controller_ips=($(cat fuel_node|grep controller|awk '{print $10}'))
     compute_ips=($(cat fuel_node|grep compute|awk '{print $10}'))
 
     pod_yaml="./etc/yardstick/nodes/fuel_baremetal/pod.yaml"
+    node_line_num=($(grep -n node[1-5] $pod_yaml | awk -F: '{print $1}'))
 
     if [[ ${controller_ips[0]} ]]; then
-        sed -i "s/ip1/${controller_ips[0]}/" $pod_yaml;
+        sed -i "${node_line_num[0]}s/node1/node${controller_IDs[0]}/;s/ip1/${controller_ips[0]}/" $pod_yaml;
     fi
     if [[ ${controller_ips[1]} ]]; then
-        sed -i "s/ip2/${controller_ips[1]}/" $pod_yaml;
+        sed -i "${node_line_num[1]}s/node2/node${controller_IDs[1]}/;s/ip2/${controller_ips[1]}/" $pod_yaml;
     fi
     if [[ ${controller_ips[2]} ]]; then
-        sed -i "s/ip3/${controller_ips[2]}/" $pod_yaml;
+        sed -i "${node_line_num[2]}s/node3/node${controller_IDs[2]}/;s/ip3/${controller_ips[2]}/" $pod_yaml;
     fi
     if [[ ${compute_ips[0]} ]]; then
-        sed -i "s/ip4/${compute_ips[0]}/" $pod_yaml;
+        sed -i "${node_line_num[3]}s/node4/node${compute_IDs[0]}/;s/ip4/${compute_ips[0]}/" $pod_yaml;
     fi
     if [[ ${compute_ips[1]} ]]; then
-        sed -i "s/ip5/${compute_ips[1]}/" $pod_yaml;
+        sed -i "${node_line_num[4]}s/node5/node${compute_IDs[1]}/;s/ip5/${compute_ips[1]}/" $pod_yaml;
     fi
 
 fi

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
index 1ad871e..67445f0 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
@@ -21,10 +21,11 @@ test_cases:
 -
     file_name: opnfv_yardstick_tc027.yaml
     constraint:
-        installer: compass
-        pod: huawei-pod1
+        installer: compass,fuel
+        pod: huawei-pod1,lf-pod2
     task_args:
         huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
+        lf-pod2: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
 -
     file_name: opnfv_yardstick_tc037.yaml
 -