Log where the robot files are being uploaded to

[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 e8cdb62..4c4f477 100755 (executable)
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -16,6 +16,9 @@ else
   ODL_STREAM=${ODL_BRANCH}
 fi
 
+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'
 
@@ -27,6 +30,9 @@ source ${WORKSPACE}/overcloudrc
 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
@@ -60,12 +66,14 @@ else
                       -v NODE_FREEZE_COMMAND:\"sudo docker stop opendaylight_api\" "
 fi
 
+LOGS_LOCATION=/tmp/robot_results
+
 robot_cmd="pybot \
   --removekeywords wuks \
   --xunit robotxunit.xml \
   -c critical \
   -e exclude \
-  -d /tmp/robot_results \
+  -d $LOGS_LOCATION \
   -v BUNDLEFOLDER:/opt/opendaylight \
   -v CONTROLLER_USER:heat-admin \
   -v DEFAULT_LINUX_PROMPT:\$ \
@@ -78,7 +86,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 \
@@ -89,7 +97,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 \
@@ -101,9 +109,16 @@ 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 ${LOGS_LOCATION}:${LOGS_LOCATION} \
   -v ${WORKSPACE}/id_rsa:/tmp/id_rsa \
   -v ${WORKSPACE}/overcloudrc:/tmp/overcloudrc \
   opnfv/cperf:$DOCKER_TAG \
   /bin/bash -c "source /tmp/overcloudrc; mkdir -p \$HOME/.ssh; cp /tmp/id_rsa \$HOME/.ssh; \
   $robot_cmd /home/opnfv/repos/odl_test/csit/suites/openstack/connectivity/l2.robot;"
+
+UPLOAD_LOCATION=artifacts.opnfv.org/cperf/cperf-apex-csit-${ODL_BRANCH}/${BUILD_NUMBER}/
+echo "Uploading robot logs to ${UPLOAD_LOCATION}"
+gsutil -m cp -r -v ${LOGS_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log
\ No newline at end of file