if [ "$ODL_BRANCH" == 'master' ]; then
ODL_STREAM='flourine'
else
- ODL_STREAM=${ODL_BRANCH}
+ ODL_STREAM=${ODL_BRANCH#"stable/"}
fi
-echo "ODL Branch set: ${ODL_BRANCH} and OS Version is ${FULL_OS_VER}"
+echo "ODL Stream set: ${ODL_STREAM} and OS Version is ${FULL_OS_VER}"
sudo rm -rf releng
git clone https://gerrit.opnfv.org/gerrit/releng.git
-v DEFAULT_LINUX_PROMPT_STRICT:]\$ \
-v DEFAULT_USER:heat-admin \
-v DEVSTACK_DEPLOY_PATH:/tmp \
+ -v EXTERNAL_GATEWAY:$CONTROLLER_1_IP \
+ -v EXTERNAL_PNF:$CONTROLLER_1_IP \
+ -v EXTERNAL_SUBNET:192.0.2.0/24 \
+ -v EXTERNAL_SUBNET_ALLOCATION_POOL:start=192.0.2.100,end=192.0.2.200 \
+ -v EXTERNAL_INTERNET_ADDR:$CONTROLLER_1_IP \
-v HA_PROXY_IP:$SDN_CONTROLLER_IP \
-v NUM_ODL_SYSTEM:$NUM_CONTROL_NODES \
-v NUM_OS_SYSTEM:$(($NUM_CONTROL_NODES + $NUM_COMPUTE_NODES)) \
-v ODL_SYSTEM_IP:$CONTROLLER_1_IP \
-v OS_CONTROL_NODE_IP:$CONTROLLER_1_IP \
-v OPENSTACK_BRANCH:$FULL_OS_VER \
- -v OPENSTACK_TOPO="0cmb-1ctl-2cmp" \
+ -v OPENSTACK_TOPO:"0cmb-1ctl-2cmp" \
-v OS_USER:heat-admin \
-v ODL_ENABLE_L3_FWD:yes \
-v ODL_SYSTEM_USER:heat-admin \
$EXTRA_ROBOT_ARGS \
-v of_port:6653 "
-suites="/home/opnfv/repos/odl_test/csit/suites/openstack/connectivity/l2.robot \
- /home/opnfv/repos/odl_test/csit/suites/openstack/connectivity/l3.robot"
+SUITE_HOME='/home/opnfv/repos/odl_test/csit/suites/openstack/connectivity'
+
+suites="${SUITE_HOME}/l2.robot \
+ ${SUITE_HOME}/l3.robot \
+ ${SUITE_HOME}/external_network.robot \
+ ${SUITE_HOME}/security_group.robot \
+ ${SUITE_HOME}/live_migration.robot \
+ ${SUITE_HOME}/neutron_security_group.robot \
+ ${SUITE_HOME}/security_group_l3bcast.robot \
+ ${SUITE_HOME}/vpn_basic.robot \
+ ${SUITE_HOME}/vpn_basic_ipv6.robot \
+ ${SUITE_HOME}/elan.robot \
+ ${SUITE_HOME}/arp_learning.robot \
+ ${SUITE_HOME}/l2l3_gatewaymac_arp.robot \
+ ${SUITE_HOME}/Create_JVM_Plots.robot"
echo "Robot command set: ${robot_cmd}"
echo "Running robot..."
/bin/bash -c "source /tmp/overcloudrc; mkdir -p \$HOME/.ssh; cp /tmp/id_rsa \$HOME/.ssh; \
cd /home/opnfv/repos/odl_test/ && git pull origin master; \
${robot_cmd} ${suites};"
-
-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