CPERF: minor fixes to csit

[releng.git] / jjb / cperf / cperf-robot-netvirt-csit.sh

diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index 3ef7471..2912911 100755 (executable)
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -4,10 +4,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source ${WORKSPACE}/overcloudrc
-# note SDN_CONTROLLER_IP is set in overcloudrc, which is the VIP
-# for admin/public network (since we are running single network deployment)
-
 if [ "$OS_VERSION" == 'master' ]; then
   FULL_OS_VER='master'
 else
@@ -20,13 +16,27 @@ else
   ODL_STREAM=${ODL_BRANCH}
 fi
 
-NUM_CONTROL_NODES=$(python ./parse-node-yaml.py num_nodes --file $NODE_FILE_PATH)
-NUM_COMPUTE_NODES=$(python ./parse-node-yaml.py num_nodes --node-type compute --file $NODE_FILE_PATH)
+echo "ODL Branch set: ${ODL_BRANCH} and OS Version is ${FULL_OS_VER}"
+
+sudo rm -rf releng
+git clone https://gerrit.opnfv.org/gerrit/releng.git
+REL_PATH='releng/jjb/cperf'
+
+# NOTE: sourcing overcloudrc unsets any variable with OS_ prefix
+source ${WORKSPACE}/overcloudrc
+# note SDN_CONTROLLER_IP is set in overcloudrc, which is the VIP
+# for admin/public network (since we are running single network deployment)
+
+NUM_CONTROL_NODES=$(python ${REL_PATH}/parse-node-yaml.py num_nodes --file $NODE_FILE_PATH)
+NUM_COMPUTE_NODES=$(python ${REL_PATH}/parse-node-yaml.py num_nodes --node-type compute --file $NODE_FILE_PATH)
+
+echo "Number of Control nodes found: ${NUM_CONTROL_NODES}"
+echo "Number of Compute nodes found: ${NUM_COMPUTE_NODES}"
 
 idx=1
 EXTRA_ROBOT_ARGS=""
 for idx in `seq 1 $NUM_CONTROL_NODES`; do
-  CONTROLLER_IP=$(python ./parse-node-yaml.py get_value -k address --node-number ${idx} --file $NODE_FILE_PATH)
+  CONTROLLER_IP=$(python ${REL_PATH}/parse-node-yaml.py get_value -k address --node-number ${idx} --file $NODE_FILE_PATH)
   EXTRA_ROBOT_ARGS+=" -v ODL_SYSTEM_${idx}_IP:${CONTROLLER_IP} \
                       -v OS_CONTROL_NODE_${idx}_IP:${CONTROLLER_IP} \
                       -v ODL_SYSTEM_${idx}_IP:${CONTROLLER_IP} \
@@ -35,11 +45,11 @@ done
 
 idx=1
 for idx in `seq 1 $NUM_COMPUTE_NODES`; do
-  COMPUTE_IP=$(python ./parse-node-yaml.py get_value -k address --node-type compute --node-number ${idx} --file $NODE_FILE_PATH)
+  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
 
-CONTROLLER_1_IP=$(python ./parse-node-yaml.py get_value -k address --node-number 1 --file $NODE_FILE_PATH)
+CONTROLLER_1_IP=$(python ${REL_PATH}/parse-node-yaml.py get_value -k address --node-number 1 --file $NODE_FILE_PATH)
 
 if [ "$ODL_CONTAINERIZED" == 'false' ]; then
   EXTRA_ROBOT_ARGS+=" -v NODE_KARAF_COUNT_COMMAND:'ps axf | grep org.apache.karaf | grep -v grep | wc -l || echo 0' \
@@ -74,7 +84,7 @@ robot_cmd="pybot \
   -v NUM_TOOLS_SYSTEM:0 \
   -v ODL_SNAT_MODE:conntrack \
   -v ODL_STREAM:$ODL_STREAM \
-  -v ODL_SYSTEM_IP: $CONTROLLER_1_IP \
+  -v ODL_SYSTEM_IP:$CONTROLLER_1_IP \
   -v OS_CONTROL_NODE_IP:$CONTROLLER_1_IP \
   -v OPENSTACK_BRANCH:$FULL_OS_VER \
   -v OS_USER:heat-admin \
@@ -85,7 +95,7 @@ robot_cmd="pybot \
   -v PUBLIC_PHYSICAL_NETWORK:datacentre \
   -v RESTCONFPORT:8081 \
   -v ODL_RESTCONF_USER:admin \
-  -v ODL_RESTCONF_PASSWORD:admin \
+  -v ODL_RESTCONF_PASSWORD:$SDN_CONTROLLER_PASSWORD \
   -v KARAF_PROMPT_LOGIN:'opendaylight-user' \
   -v KARAF_PROMPT:'opendaylight-user.*root.*>' \
   -v SECURITY_GROUP_MODE:stateful \
@@ -97,6 +107,8 @@ robot_cmd="pybot \
   $EXTRA_ROBOT_ARGS \
   -v of_port:6653 "
 
+echo "Robot command set: ${robot_cmd}"
+echo "Running robot..."
 docker run -i --net=host \
   -v ${WORKSPACE}/id_rsa:/tmp/id_rsa \
   -v ${WORKSPACE}/overcloudrc:/tmp/overcloudrc \