aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ci
diff options
context:
space:
mode:
authorrexlee8776 <limingjiang@huawei.com>2016-09-29 06:41:13 +0000
committerrexlee8776 <limingjiang@huawei.com>2016-09-29 07:16:41 +0000
commit0a0a2cc3d7a5179c0a3183b99494e27ab83546e5 (patch)
treecc457365e403680ed43f4690f85786723a74820e /tests/ci
parent1f389fa4e814bda23fcb650a737ef2bff13aacf8 (diff)
ipv6 testcase to support fuel
JIRA: YARDSTICK-363 1. fuel pod.yaml node id update according to the real environment 2. add constaints to run ipv6 on one fuel physical pod(lf-pod2) Change-Id: I5b91f1bea84f2c79e0b9c3195028e38ddad55363 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
Diffstat (limited to 'tests/ci')
-rwxr-xr-xtests/ci/prepare_env.sh14
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index 9c949ec4f..130969fa1 100755
--- 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