printf "\nshowing recent changes that made it into integration/test used by this job:\n"
cd ${WORKSPACE}/test
-git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s' -n10
+printf "Hash Author Date Commit Date Author Subject"
+printf "------- ------------------------------ ------------------------------ -------------------- -----------------------------"
+git --no-pager log --pretty=format:'%h %<(30)%ad%<(30)%cd %<(20,trunc)%an%d %s' -n20
cd -
cat << EOF
if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
echo "ODL_V2DRIVER=True" >> ${local_conf_file_name}
fi
-
IFS=,
for plugin_name in ${ENABLE_OS_PLUGINS}; do
if [ "$plugin_name" == "networking-odl" ]; then
ENABLE_PLUGIN_ARGS="${DEVSTACK_LBAAS_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
IS_LBAAS_PLUGIN_ENABLED="yes"
elif [ "$plugin_name" == "networking-sfc" ]; then
- ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
+ ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} master"
+ IS_SFC_PLUGIN_ENABLED="yes"
else
echo "Error: Invalid plugin $plugin_name, unsupported"
continue
if [ "${IS_LBAAS_PLUGIN_ENABLED}" == "yes" ]; then
SERVICE_PLUGINS+=", lbaasv2"
fi
+ if [ "${IS_SFC_PLUGIN_ENABLED}" == "yes" ]; then
+ SERVICE_PLUGINS+=", networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,networking_sfc.services.sfc.plugin.SfcPlugin"
+ fi
fi #check for ODL_ENABLE_L3_FWD
cat >> ${local_conf_file_name} << EOF
${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err_warn_exception.log
# Print ROBOT lines and print Exception lines. For exception lines also print the previous line for context
sed -n -e '/ROBOT MESSAGE/P' -e '$!N;/Exception/P;D' ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_exception.log
+ mv /tmp/odl${i}_exceptions.txt ${NODE_FOLDER}
rm ${NODE_FOLDER}/odl${i}_karaf.log.tar
mv *_threads* ${NODE_FOLDER}
mv ps_* ${NODE_FOLDER}
exit 1
fi
- # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node
- # this needs to happen after devstack runs because it seems devstack is pulling in specific versions
- # of these libs that are not working for tempest.
- ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip"
- ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade"
- ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade"
+ if [ "${OPENSTACK_BRANCH}" == "stable/pike" ]; then
+ # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node
+ # this needs to happen after devstack runs because it seems devstack is pulling in specific versions
+ # of these libs that are not working for tempest.
+ ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip"
+ ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade"
+ ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade"
+ fi
# Gather Compute IPs for the site
for j in `seq 1 ${NUM_COMPUTES_PER_SITE}`; do
-v HA_PROXY_2_IP:${HA_PROXY_2_IP} \
-v HA_PROXY_3_IP:${HA_PROXY_3_IP} \
-v JDKVERSION:${JDKVERSION} \
+ -v JENKINS_WORKSPACE:${WORKSPACE} \
-v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
-v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
-v NUM_OPENSTACK_SITES:${NUM_OPENSTACK_SITES} \