Switch tempest runner to iptables-free config

Change-Id: I600ec4eae8bdc89f2c751ee4efb5aeb4590360ed

diff --git a/maintenance-ci/mos/rally-docker/Dockerfile b/maintenance-ci/mos/rally-docker/Dockerfile
index 8db9a44aeb1cf3e78ca633e3332a4731ff74ee83..cfd515cce852a134ae5228886304872d579deaf9 100644 (file)
--- a/maintenance-ci/mos/rally-docker/Dockerfile
+++ b/maintenance-ci/mos/rally-docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:16.04
 
-LABEL rebuild="build2"
+LABEL rebuild="build3"
 
 ENV DEBIAN_FRONTEND=noninteractive \
     DEBCONF_NONINTERACTIVE_SEEN=true \

diff --git a/maintenance-ci/mos/rally-docker/run_rally_tempest.sh b/maintenance-ci/mos/rally-docker/run_rally_tempest.sh
index 5c9d73a783b0c3ee092e19cce0f11e4e97d0f15c..80558054cd33e722d406330e2e808faac5a6ac77 100644 (file)
--- a/maintenance-ci/mos/rally-docker/run_rally_tempest.sh
+++ b/maintenance-ci/mos/rally-docker/run_rally_tempest.sh
@@ -37,12 +37,6 @@ scp_from_controller() {
     scp "${SSH_OPTIONS[@]}" "${SCP_ARGS[@]}" "${VM_USERNAME}@${CTL_ADMIN_IP}:$1" "$2"
 }
 
-pkill_ssh() {
-  pkill ssh
-}
-
-trap "pkill_ssh" ERR
-
 mkdir -p /root/.ssh
 cp /root/shared/id_rsa* /root/.ssh
 chmod 600 /root/.ssh/*
@@ -51,13 +45,12 @@ OPENRC_FILE=/root/openrc
 
 source /root/shared/ssh_connection_data.sh
 
-echo "Fuel admin IP: ${FUEL_ADMIN_IP}"
-echo "CTL node admin IP: ${CTL_ADMIN_IP}"
-echo "VM_USERNAME= ${VM_USERNAME}"
-echo "VM_PASSWORD= ${VM_PASSWORD}"
+echo "Fuel admin IP:'${FUEL_ADMIN_IP}'"
+echo "CTL node admin IP:'${CTL_ADMIN_IP}'"
+echo "VM_USERNAME='${VM_USERNAME}'"
+echo "VM_PASSWORD='${VM_PASSWORD}'"
 
 ssh_to_fuel_master "ssh ${CTL_ADMIN_IP} echo \"$(cat /root/shared/id_rsa.pub) >> /root/.ssh/authorized_keys\""
-sshuttle -D -e "ssh ${SSH_OPTIONS[*]}" -r "${VM_USERNAME}@${CTL_ADMIN_IP}" "10.109.0.0/16"
 
 scp_from_controller /root/openrc ${OPENRC_FILE}
 if ssh_to_controller "test -f /var/lib/astute/haproxy/public_haproxy.pem" ; then
@@ -85,6 +78,8 @@ fi
 
 grep public.fuel.local /etc/hosts || ssh_to_controller "grep public.fuel.local /etc/hosts" >> /etc/hosts || echo "non-ssl env, skipping"
 
+ssh_to_fuel_master 'seq 6 | xargs -tI{} ssh node-{} "iptables -I INPUT 1 -j ACCEPT && iptables -I FORWARD 1 -j ACCEPT && for ns in \$(ip netns list); do ip netns exec \$ns iptables -I INPUT 1 -j ACCEPT && ip netns exec \$ns iptables -I FORWARD 1 -j ACCEPT; done"'
+
 source /root/rally/rally-venv/bin/activate
 # shellcheck disable=SC1090
 source ${OPENRC_FILE}
@@ -104,6 +99,7 @@ fi
 
 set +e
 rally verify results --json --output-file output.json
+rally verify results --html --output-file output.html
 rally verify showconfig > /root/rally/tempest.conf
 cp "$(find / -name tempest.log)" /root/rally/tempest.log
 git clone https://github.com/EduardFazliev/rally_json2junit
@@ -112,15 +108,16 @@ python rally_json2junit/rally_json2junit/results_parser.py output.json
 USER_ID=$(ls -nd /root/shared/id_rsa | awk '{print $3}')
 GROUP_ID=$(ls -nd /root/shared/id_rsa | awk '{print $4}')
 
-chown -hR ${USER_ID}:${GROUP_ID} /root/rally/tempest.conf
-chown -hR ${USER_ID}:${GROUP_ID} /root/rally/log.log
-chown -hR ${USER_ID}:${GROUP_ID} /root/output.json
-chown -hR ${USER_ID}:${GROUP_ID} /root/verification.xml
+#chown -hR ${USER_ID}:${GROUP_ID} /root/rally/tempest.conf
+#chown -hR ${USER_ID}:${GROUP_ID} /root/rally/log.log
+#chown -hR ${USER_ID}:${GROUP_ID} /root/output.json
+#chown -hR ${USER_ID}:${GROUP_ID} /root/verification.xml
 
 mkdir -p /root/shared/results
 cp /root/rally/log.log /root/shared/results/
 cp /root/rally/tempest.log /root/shared/results/
 cp /root/verification.xml /root/shared/results/
 cp /root/output.json /root/shared/results/
+cp /root/output.html /root/shared/results/
 
 chown -hR ${USER_ID}:${GROUP_ID} /root/shared
\ No newline at end of file