X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fcommon-functions.sh;h=8cdbc0b7525bfbb12268e56d381343feeadad4fe;hb=e30354caada973c8e1770bee711b651f3eb77db6;hp=0e1af1bbb4dbc800489dbfd3fb5844d2afec6036;hpb=e18f39bb538317ab06d25e5c3965e4872e69e062;p=releng%2Fbuilder.git diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh index 0e1af1bbb..8cdbc0b75 100644 --- a/jjb/integration/common-functions.sh +++ b/jjb/integration/common-functions.sh @@ -21,6 +21,7 @@ function print_common_env() { cat << EOF common-functions environment: MAVENCONF: ${MAVENCONF} +ACTUALFEATURES: ${ACTUALFEATURES} FEATURESCONF: ${FEATURESCONF} CUSTOMPROP: ${CUSTOMPROP} LOGCONF: ${LOGCONF} @@ -29,6 +30,7 @@ CONTROLLERMEM: ${CONTROLLERMEM} AKKACONF: ${AKKACONF} MODULESCONF: ${MODULESCONF} MODULESHARDSCONF: ${MODULESHARDSCONF} +SUITES: ${SUITES} EOF } @@ -77,6 +79,9 @@ function configure_karaf_log() { echo "Configuring the karaf log... karaf_version: ${karaf_version}, logapi: ${logapi}" if [ "${logapi}" == "log4j2" ]; then # FIXME: Make log size limit configurable from build parameter. + # From Neon the default karaf file size is 64 MB + sed -ie 's/log4j2.appender.rolling.policies.size.size = 64MB/log4j2.appender.rolling.policies.size.size = 1GB/g' ${LOGCONF} + # Flourine still uses 16 MB sed -ie 's/log4j2.appender.rolling.policies.size.size = 16MB/log4j2.appender.rolling.policies.size.size = 1GB/g' ${LOGCONF} orgmodule="org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver" orgmodule_="${orgmodule//./_}" @@ -90,8 +95,9 @@ function configure_karaf_log() { 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 @@ -117,6 +123,73 @@ function configure_karaf_log() { 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 configure_odl_features_for_apex() { + + # if the environment variable $ACTUALFEATURES is not null, then rewrite + # the puppet config file with the features given in that variable, otherwise + # this function is a noop + + local -r controller_ip=$1 + local -r config_file=/etc/puppet/hieradata/service_configs.json + +cat > /tmp/set_odl_features.sh << EOF +sudo jq '.["opendaylight::extra_features"] |= []' $config_file > tmp.json && mv tmp.json $config_file +for feature in $(echo $ACTUALFEATURES | sed "s/,/ /g"); do + sudo jq --arg jq_arg \$feature '.["opendaylight::extra_features"] |= . + [\$jq_arg]' $config_file > tmp && mv tmp $config_file; +done +echo "Modified puppet-opendaylight service_configs.json..." +cat $config_file +EOF + + echo "Feature configuration script..." + cat /tmp/set_odl_features.sh + + if [ -n "${ACTUALFEATURES}" ]; then + scp /tmp/set_odl_features.sh $controller_ip:/tmp/set_odl_features.sh + ssh $controller_ip "sudo bash /tmp/set_odl_features.sh" + fi + +} # function configure_odl_features_for_apex() + function get_os_deploy() { local -r num_systems=${1:-$NUM_OPENSTACK_SYSTEM} case ${num_systems} in @@ -133,6 +206,40 @@ function get_os_deploy() { 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 @@ -145,7 +252,7 @@ function run_plan() { ;; 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}" @@ -155,17 +262,17 @@ function run_plan() { 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: @@ -175,7 +282,7 @@ function timer() { if [ $# -eq 0 ]; then # return the current time - printf "$(date "+%s")" + printf "%s" "$(date "+%s")" else local start_time=$1 end_time=$(date "+%s") @@ -268,7 +375,7 @@ function tcpdump_start() { 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" } @@ -276,7 +383,7 @@ function tcpdump_start() { 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" @@ -332,7 +439,7 @@ function collect_openstack_logs() { 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 @@ -372,7 +479,7 @@ fi 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" @@ -418,6 +525,7 @@ EOF 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" @@ -425,7 +533,7 @@ EOF sleep 5 # FIXME: Do not create .tar and gzip before copying. - for i in `seq 1 ${NUM_ODL_SYSTEM}`; do + for i in $(seq 1 "${NUM_ODL_SYSTEM}"); do CONTROLLERIP=ODL_SYSTEM_${i}_IP echo "collect_logs: for opendaylight controller ip: ${!CONTROLLERIP}" NODE_FOLDER="odl_${i}" @@ -464,7 +572,7 @@ EOF print_job_parameters > ${WORKSPACE}/archives/params.txt # Control Node - for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do + for i in $(seq 1 "${NUM_OPENSTACK_CONTROL_NODES}"); do OSIP=OPENSTACK_CONTROL_NODE_${i}_IP if [ "$(is_openstack_feature_enabled n-cpu)" == "1" ]; then echo "collect_logs: for openstack combo node ip: ${!OSIP}" @@ -534,7 +642,7 @@ EOF done # Compute Nodes - for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do + for i in $(seq 1 "${NUM_OPENSTACK_COMPUTE_NODES}"); do OSIP=OPENSTACK_COMPUTE_NODE_${i}_IP echo "collect_logs: for openstack compute node ip: ${!OSIP}" NODE_FOLDER="compute_${i}" @@ -601,7 +709,7 @@ function join() { function get_nodes_list() { # Create the string for nodes - for i in `seq 1 ${NUM_ODL_SYSTEM}` ; do + for i in $(seq 1 "${NUM_ODL_SYSTEM}") ; do CONTROLLERIP=ODL_SYSTEM_${i}_IP nodes[$i]=${!CONTROLLERIP} done @@ -620,7 +728,7 @@ function get_features() { # Some versions of jenkins job builder result in feature list containing spaces # and ending in newline. Remove all that. - ACTUALFEATURES=`echo "${ACTUALFEATURES}" | tr -d '\n \r'` + ACTUALFEATURES=$(echo "${ACTUALFEATURES}" | tr -d '\n \r') echo "ACTUALFEATURES: ${ACTUALFEATURES}" # In the case that we want to install features via karaf shell, a space separated list of @@ -786,7 +894,7 @@ EOF # Copy over the configuration script and configuration files to each controller # Execute the configuration script on each controller. function copy_and_run_configuration_script() { - for i in `seq 1 ${NUM_ODL_SYSTEM}`; do + for i in $(seq 1 "${NUM_ODL_SYSTEM}"); do CONTROLLERIP=ODL_SYSTEM_${i}_IP echo "Configuring member-${i} with IP address ${!CONTROLLERIP}" scp ${WORKSPACE}/configuration-script.sh ${!CONTROLLERIP}:/tmp/ @@ -796,7 +904,7 @@ function copy_and_run_configuration_script() { # Copy over the startup script to each controller and execute it. function copy_and_run_startup_script() { - for i in `seq 1 ${NUM_ODL_SYSTEM}`; do + for i in $(seq 1 "${NUM_ODL_SYSTEM}"); do CONTROLLERIP=ODL_SYSTEM_${i}_IP echo "Starting member-${i} with IP address ${!CONTROLLERIP}" scp ${WORKSPACE}/startup-script.sh ${!CONTROLLERIP}:/tmp/ @@ -806,7 +914,7 @@ function copy_and_run_startup_script() { function copy_and_run_post_startup_script() { seed_index=1 - for i in `seq 1 ${NUM_ODL_SYSTEM}`; do + for i in $(seq 1 "${NUM_ODL_SYSTEM}"); do CONTROLLERIP=ODL_SYSTEM_${i}_IP echo "Execute the post startup script on controller ${!CONTROLLERIP}" scp ${WORKSPACE}/post-startup-script.sh ${!CONTROLLERIP}:/tmp @@ -819,7 +927,7 @@ function copy_and_run_post_startup_script() { function create_controller_variables() { echo "Generating controller variables..." - for i in `seq 1 ${NUM_ODL_SYSTEM}`; do + for i in $(seq 1 "${NUM_ODL_SYSTEM}"); do CONTROLLERIP=ODL_SYSTEM_${i}_IP odl_variables=${odl_variables}" -v ${CONTROLLERIP}:${!CONTROLLERIP}" echo "Lets's take the karaf thread dump"