if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
#networking-l2gw is not officially available in any release yet. Gettting the latest stable version.
- $PYTHON -m pip install networking-l2gw
+ $PYTHON -m pip install networking-l2gw==11.0.0
fi
}
"
}
+function fix_tinyrpc_version() {
+ local ip=$1
+ ${SSH} ${ip} "
+ cd /opt/stack;
+ git clone https://git.openstack.org/openstack/requirements;
+ cd requirements;
+ sed -i s/tinyrpc===0.7/tinyrpc===0.6/ upper-constraints.txt
+ "
+}
+
# Add enable_services and disable_services to the local.conf
function add_os_services() {
local core_services=$1
${SSH} ${ip} "sudo find /opt/stack > ${finddir}/find.opt.stack.txt"
${SSH} ${ip} "sudo find /var > ${finddir}/find2.txt"
${SSH} ${ip} "sudo find /var > ${finddir}/find.var.txt"
- ${SSH} ${ip} "sudo tar -cJf /tmp/find.tar.xz -C /tmp finder"
+ ${SSH} ${ip} "sudo tar -cf - -C /tmp finder | xz -T 0 > /tmp/find.tar.xz"
scp ${ip}:/tmp/find.tar.xz ${folder}
mkdir -p ${finddir}
rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/etc/ > ${finddir}/rsync.etc.txt
rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/opt/stack/ > ${finddir}/rsync.opt.stack.txt
rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/var/ > ${finddir}/rsync.var.txt
- tar -cJf /tmp/rsync.tar.xz -C /tmp finder
+ tar -cf - -C /tmp finder | xz -T 0 > /tmp/rsync.tar.xz
cp /tmp/rsync.tar.xz ${folder}
}
scp ${!CONTROLLERIP}:/tmp/journalctl.log ${NODE_FOLDER}
${SSH} ${!CONTROLLERIP} "dmesg -T > /tmp/dmesg.log"
scp ${!CONTROLLERIP}:/tmp/dmesg.log ${NODE_FOLDER}
- ${SSH} ${!CONTROLLERIP} "tar -cJf /tmp/etc.tar.xz -C /tmp/${BUNDLEFOLDER} etc"
+ ${SSH} ${!CONTROLLERIP} "tar -cf - -C /tmp/${BUNDLEFOLDER} etc | xz -T 0 > /tmp/etc.tar.xz"
scp ${!CONTROLLERIP}:/tmp/etc.tar.xz ${NODE_FOLDER}
${SSH} ${!CONTROLLERIP} "cp -r /tmp/${BUNDLEFOLDER}/data/log /tmp/odl_log"
${SSH} ${!CONTROLLERIP} "tar -cf /tmp/odl${i}_karaf.log.tar /tmp/odl_log/*"
scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
collect_files "${!OSIP}" "${NODE_FOLDER}"
- ${SSH} ${!OSIP} "sudo tar -cJf /tmp/rabbitmq.tar.xz -C /var/log rabbitmq"
+ ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log rabbitmq | xz -T 0 > /tmp/rabbitmq.tar.xz "
scp ${!OSIP}:/tmp/rabbitmq.tar.xz ${NODE_FOLDER}
rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/usr/lib/systemd/system/haproxy.service ${NODE_FOLDER}
rsync -avhe ssh ${!OSIP}:/opt/stack/logs/* ${NODE_FOLDER} # rsync to prevent copying of symbolic links
mv local.conf_control_${!OSIP} ${NODE_FOLDER}/local.conf
# qdhcp files are created by robot tests and copied into /tmp/qdhcp during the test
- tar -cJf /tmp/qdhcp.tar.xz -C /tmp qdhcp
+ tar -cf - -C /tmp qdhcp | xz -T 0 > /tmp/qdhcp.tar.xz
mv /tmp/qdhcp.tar.xz ${NODE_FOLDER}
mv ${NODE_FOLDER} ${WORKSPACE}/archives/
done
scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
collect_files "${!OSIP}" "${NODE_FOLDER}"
- ${SSH} ${!OSIP} "sudo tar -cJf /tmp/libvirt.tar.xz -C /var/log libvirt"
+ ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log libvirt | xz -T 0 > /tmp/libvirt.tar.xz "
scp ${!OSIP}:/tmp/libvirt.tar.xz ${NODE_FOLDER}
rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
if [ "${ODL_ML2_BRANCH}" == "master" ]; then
ssh ${!CONTROLIP} "sed -i 's/flat_networks public/flat_networks public,physnet1/' /opt/stack/devstack/lib/neutron"
ssh ${!CONTROLIP} "sed -i '186i iniset \$NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges public:1:4094,physnet1:1:4094' /opt/stack/devstack/lib/neutron"
+ echo "Modify uppper-constraints to use tinyrpc 0.6"
+ fix_tinyrpc_version ${!CONTROLIP}
fi
if [[ "${ODL_ML2_BRANCH}" == "stable/ocata" && "$(is_openstack_feature_enabled n-cpu)" == "1" ]]; then
echo "Updating requirements for ${ODL_ML2_BRANCH}"
echo "Modify upper-constraints to use libvirt-python 3.2.0"
fix_libvirt_version_n_cpu_ocata ${!COMPUTEIP}
fi
+ if [ "${ODL_ML2_BRANCH}" == "master" ]; then
+ echo "Modify uppper-constraints to use tinyrpc 0.6"
+ fix_tinyrpc_version ${!CONTROLIP}
+ fi
create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${COMPUTEIP}"
sudo ip netns exec pnf_ns ifconfig pnf_veth1 up ${EXTNET_PNF_IP}/24;
sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0;
"
- # Control Node - set VXLAN TEP IP for Genius Auto TZ
- ${SSH} ${!CONTROLIP} "
- sudo ovs-vsctl set O . external_ids:tep-ip=${!CONTROLIP};
- "
# Control Node - external net internet address simulation
${SSH} ${!CONTROLIP} "
# please add pybot -v arguments on a single line and alphabetized
suite_num=0
for suite in ${SUITES}; do
- # prepend a incrmental counter to the suite name so that the full robot log combining all the suites as is done
- # in the rebot step below will list all the suites in chronological order as rebot seems to alphabatize them
+ # prepend an incremental counter to the suite name so that the full robot log combining all the suites as is done
+ # in the rebot step below will list all the suites in chronological order as rebot seems to alphabetize them
let "suite_num = suite_num + 1"
suite_index="$(printf %02d ${suite_num})"
suite_name="$(basename ${suite} | cut -d. -f1)"
log_name="${suite_index}_${suite_name}"
- pybot -N ${log_name} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+ pybot -N ${log_name} \
+ -c critical -e exclude -e skip_if_${DISTROSTREAM} \
--log log_${log_name}.html --report None --output output_${log_name}.xml \
+ --removekeywords wuks \
+ --removekeywords name:SetupUtils.Setup_Utils_For_Setup_And_Teardown \
+ --removekeywords name:SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing \
+ --removekeywords name:OpenStackOperations.Add_OVS_Logging_On_All_OpenStack_Nodes \
-v BUNDLEFOLDER:${BUNDLEFOLDER} \
-v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
-v CONTROLLERFEATURES:"${CONTROLLERFEATURES}" \