fi
# Add custom logging levels
- # CONTROLLERDEBUGMAP is expected to be a key:value map of space separated values like "module:level module2:level2"
- # where module is abbreviated and does not include "org.opendaylight."
+ # CONTROLLERDEBUGMAP is expected to be a key:value map of space separated
+ # values like "module:level module2:level2" where module is abbreviated and
+ # does not include "org.opendaylight."
unset IFS
echo "controllerdebugmap: ${controllerdebugmap}"
if [ -n "${controllerdebugmap}" ]; then
cat ${LOGCONF}
} # function configure_karaf_log()
+function configure_karaf_log_for_apex() {
+ # TODO: add the extra steps to this function to do any extra work
+ # in this apex environment like we do in our standard environment.
+ # EX: log size, rollover, etc.
+
+ # Modify ODL Log Levels, if needed, for new distribution. This will modify
+ # the control nodes hiera data which will be used during the puppet deploy
+ # CONTROLLERDEBUGMAP is expected to be a key:value map of space separated
+ # values like "module:level module2:level2" where module is abbreviated and
+ # does not include "org.opendaylight."
+
+ local -r controller_ip=$1
+
+ unset IFS
+ # shellcheck disable=SC2153
+ echo "CONTROLLERDEBUGMAP: ${CONTROLLERDEBUGMAP}"
+ if [ -n "${CONTROLLERDEBUGMAP}" ]; then
+ logging_config='\"opendaylight::log_levels\": {'
+ for kv in ${CONTROLLERDEBUGMAP}; do
+ module="${kv%%:*}"
+ level="${kv#*:}"
+ echo "module: $module, level: $level"
+ # shellcheck disable=SC2157
+ if [ -n "${module}" ] && [ -n "${level}" ]; then
+ orgmodule="org.opendaylight.${module}"
+ logging_config="${logging_config} \\\"${orgmodule}\\\": \\\"${level}\\\","
+ fi
+ done
+ # replace the trailing comma with a closing brace followed by trailing comma
+ logging_config=${logging_config%,}" },"
+ echo $logging_config
+
+ # fine a sane line number to inject the custom logging json
+ lineno=$(ssh $OPENSTACK_CONTROL_NODE_1_IP "sudo grep -Fn 'opendaylight::log_mechanism' /etc/puppet/hieradata/service_configs.json" | awk -F: '{print $1}')
+ ssh $controller_ip "sudo sed -i \"${lineno}i ${logging_config}\" /etc/puppet/hieradata/service_configs.json"
+ ssh $controller_ip "sudo cat /etc/puppet/hieradata/service_configs.json"
+ fi
+} # function configure_karaf_log_for_apex()
+
function get_os_deploy() {
local -r num_systems=${1:-$NUM_OPENSTACK_SYSTEM}
case ${num_systems} in
export OPENSTACK_TOPO
}
+function get_test_suites() {
+
+ #let the caller pick the name of the variable we will assign the suites to
+ local __suite_list=$1
+
+ echo "Locating test plan to use..."
+ testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}"
+ if [ ! -f "${testplan_filepath}" ]; then
+ testplan_filepath="${WORKSPACE}/test/csit/testplans/${TESTPLAN}"
+ fi
+
+ echo "Changing the testplan path..."
+ cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
+ cat testplan.txt
+
+ # Use the testplan if specific SUITES are not defined.
+ if [ -z "${SUITES}" ]; then
+ suite_list=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
+ else
+ suite_list=""
+ workpath="${WORKSPACE}/test/csit/suites"
+ for suite in ${SUITES}; do
+ fullsuite="${workpath}/${suite}"
+ if [ -z "${suite_list}" ]; then
+ suite_list+=${fullsuite}
+ else
+ suite_list+=" "${fullsuite}
+ fi
+ done
+ fi
+
+ eval $__suite_list="'$suite_list'"
+}
+
function run_plan() {
local -r type=$1
;;
esac
- printf "Locating ${type} plan to use...\n"
+ printf "Locating %s plan to use...\n" "${type}"
plan_filepath="${WORKSPACE}/test/csit/${type}plans/$plan"
if [ ! -f "${plan_filepath}" ]; then
plan_filepath="${WORKSPACE}/test/csit/${type}plans/${STREAMTESTPLAN}"
fi
if [ -f "${plan_filepath}" ]; then
- printf "${type} plan exists!!!\n"
- printf "Changing the ${type} plan path...\n"
+ printf "%s plan exists!!!\n" "${type}"
+ printf "Changing the %s plan path...\n" "${type}"
cat ${plan_filepath} | sed "s:integration:${WORKSPACE}:" > ${type}plan.txt
cat ${type}plan.txt
for line in $( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' ${type}plan.txt ); do
- printf "Executing ${line}...\n"
+ printf "Executing %s...\n" "${line}"
# shellcheck source=${line} disable=SC1091
source ${line}
done
fi
- printf "Finished running ${type} plans\n"
+ printf "Finished running %s plans\n" "${type}"
} # function run_plan()
# Return elapsed time. Usage:
{
if [ $# -eq 0 ]; then
# return the current time
- printf "$(date "+%s")"
+ printf "%s" "$(date "+%s")"
else
local start_time=$1
end_time=$(date "+%s")
local -r filter=$3
filter_=${filter// /_}
- printf "node ${ip}, ${prefix}_${ip}__${filter}: starting tcpdump\n"
+ printf "node %s, %s_%s__%s: starting tcpdump\n" "${ip}" "${prefix}" "${ip}" "${filter}"
ssh ${ip} "nohup sudo /usr/sbin/tcpdump -vvv -ni eth0 ${filter} -w /tmp/tcpdump_${prefix}_${ip}__${filter_}.pcap > /tmp/tcpdump_start.log 2>&1 &"
${SSH} ${ip} "ps -ef | grep tcpdump"
}
function tcpdump_stop() {
local -r ip=$1
- printf "node $ip: stopping tcpdump\n"
+ printf "node %s: stopping tcpdump\n" "$ip"
${SSH} ${ip} "ps -ef | grep tcpdump.sh"
${SSH} ${ip} "sudo pkill -f tcpdump"
${SSH} ${ip} "sudo xz -9ekvvf /tmp/*.pcap"
local -r node_type=${3}
local oslogs="${folder}/oslogs"
- printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}\n"
+ printf "collect_openstack_logs for %s node: %s into %s\n" "${node_type}" "${ip}" "${oslogs}"
rm -rf ${oslogs}
mkdir -p ${oslogs}
# There are always some logs in /opt/stack/logs and this also covers the
ls -al /tmp/oslogs
EOF
# cat > ${WORKSPACE}/collect_openstack_logs.sh << EOF
- printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}, executing script\n"
+ printf "collect_openstack_logs for %s node: %s into %s, executing script\n" "${node_type}" "${ip}" "${oslogs}"
cat ${WORKSPACE}/collect_openstack_logs.sh
scp ${WORKSPACE}/collect_openstack_logs.sh ${ip}:/tmp
${SSH} ${ip} "bash /tmp/collect_openstack_logs.sh > /tmp/collect_openstack_logs.log 2>&1"
mkdir -p ${WORKSPACE}/archives
mv /tmp/changes.txt ${WORKSPACE}/archives
+ mv /tmp/validations.txt ${WORKSPACE}/archives
mv ${WORKSPACE}/rabbit.txt ${WORKSPACE}/archives
+ mv ${WORKSPACE}/haproxy.cfg ${WORKSPACE}/archives
+ ssh ${OPENSTACK_HAPROXY_1_IP} "sudo journalctl -u haproxy > /tmp/haproxy.log"
+ scp ${OPENSTACK_HAPROXY_1_IP}:/tmp/haproxy.log ${WORKSPACE}/archives/
sleep 5
# FIXME: Do not create .tar and gzip before copying.
echo "Waiting up to 3 minutes for controller to come up, checking every 5 seconds..."
for i in {1..36}; do
sleep 5;
- grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+ grep 'org.opendaylight.infrautils.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
if [ \$? -eq 0 ]; then
echo "Controller is UP"
break
done;
# if we ended up not finding ready status in the above loop, we can output some debugs
-grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+grep 'org.opendaylight.infrautils.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
if [ $? -ne 0 ]; then
echo "Timeout Controller DOWN"
echo "Dumping first 500K bytes of karaf log..."
Code Review / releng / builder.git / blobdiff