summaryrefslogtreecommitdiffstats
path: root/jjb/cperf/cperf-robot-netvirt-csit.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-08-15 17:08:49 -0400
committerTim Rozet <trozet@redhat.com>2018-08-15 17:08:49 -0400
commit78bfef0da4d7bf632b630b1815725efef14f94f7 (patch)
treee32025e330d00286b13adce911334637413f2936 /jjb/cperf/cperf-robot-netvirt-csit.sh
parent1223396e23e07d57fe0d04a2c40cedc460513f1d (diff)
Cperf: Fix all-in-one compute robot args
CSIT requires that OS_COMPUTE_1_IP and OS_COMPUTE_2_IP are still passed with empty values. Change-Id: I694f237bdae1f2a4804d79ff6cde13b99eba7ddc Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/cperf/cperf-robot-netvirt-csit.sh')
-rwxr-xr-xjjb/cperf/cperf-robot-netvirt-csit.sh15
1 files changed, 10 insertions, 5 deletions
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index f01bf0450..0895ab624 100755
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -49,11 +49,16 @@ for idx in `seq 1 $NUM_CONTROL_NODES`; do
-v HA_PROXY_${idx}_IP:${SDN_CONTROLLER_IP}"
done
-idx=1
-for idx in `seq 1 $NUM_COMPUTE_NODES`; do
- COMPUTE_IP=$(python ${REL_PATH}/parse-node-yaml.py get_value -k address --node-type compute --node-number ${idx} --file $NODE_FILE_PATH)
- EXTRA_ROBOT_ARGS+=" -v OS_COMPUTE_${idx}_IP:${COMPUTE_IP}"
-done
+# In all-in-one these Compute IPs still need to be passed to robot
+if [ "$NUM_COMPUTE_NODES" -eq 0 ]; then
+ EXTRA_ROBOT_ARGS+=" -v OS_COMPUTE_1_IP:'' -v OS_COMPUTE_2_IP:''"
+else
+ idx=1
+ for idx in `seq 1 $NUM_COMPUTE_NODES`; do
+ COMPUTE_IP=$(python ${REL_PATH}/parse-node-yaml.py get_value -k address --node-type compute --node-number ${idx} --file $NODE_FILE_PATH)
+ EXTRA_ROBOT_ARGS+=" -v OS_COMPUTE_${idx}_IP:${COMPUTE_IP}"
+ done
+fi
CONTROLLER_1_IP=$(python ${REL_PATH}/parse-node-yaml.py get_value -k address --node-number 1 --file $NODE_FILE_PATH)