Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "ssh.py: add flag to keep stdin open"
[yardstick.git]
/
tests
/
ci
/
prepare_env.sh
diff --git
a/tests/ci/prepare_env.sh
b/tests/ci/prepare_env.sh
index
9c949ec
..
be59b7f
100755
(executable)
--- a/
tests/ci/prepare_env.sh
+++ b/
tests/ci/prepare_env.sh
@@
-74,13
+74,6
@@
verify_connectivity() {
error "Can not talk to $ip."
}
error "Can not talk to $ip."
}
-YARD_IMG_ARCH=amd64
-export YARD_IMG_ARCH
-
-if ! grep -q "Defaults env_keep += \"YARD_IMG_ARCH\"" "/etc/sudoers"; then
- sudo echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" >> /etc/sudoers
-fi
-
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
if [ "$INSTALLER_TYPE" == "fuel" ]; then
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
if [ "$INSTALLER_TYPE" == "fuel" ]; then
@@
-90,31
+83,32
@@
if [ "$INSTALLER_TYPE" == "fuel" ]; then
sshpass -p r00tme scp 2>/dev/null $ssh_options \
root@${INSTALLER_IP}:~/.ssh/id_rsa /root/.ssh/id_rsa &> /dev/null
sshpass -p r00tme scp 2>/dev/null $ssh_options \
root@${INSTALLER_IP}:~/.ssh/id_rsa /root/.ssh/id_rsa &> /dev/null
- ARCH_SCRIPT="test -f /etc/fuel_openstack_arch && grep -q arm64 /etc/fuel_openstack_arch"
- sshpass -p r00tme ssh $ssh_options -l root $INSTALLER_IP "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64
-
sshpass -p r00tme ssh 2>/dev/null $ssh_options \
root@${INSTALLER_IP} fuel node>fuel_node
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"
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
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
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
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
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
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
fi
fi