export CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
export LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
export MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
-export CONTROLLERMEM="2048m"
+export CONTROLLERMEM=${CONTROLLERMAXMEM}
# Cluster specific configuration settings
export AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
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
+ # Increase default log file size to 1GB
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//./_}"
echo "${logapi}.logger.${orgmodule_}.name = WARN" >> "${LOGCONF}"
for line in $( grep -E -v '(^[[:space:]]*#|^[[:space:]]*$)' "${type}plan.txt" ); do
printf "Executing %s...\\n" "${line}"
# shellcheck source=${line} disable=SC1091
- source "${line}"
+ . "${line}"
done
fi
printf "Finished running %s plans\\n" "${type}"
BUNDLE_URL: ${BUNDLE_URL}
CONTROLLERFEATURES: ${CONTROLLERFEATURES}
CONTROLLERDEBUGMAP: ${CONTROLLERDEBUGMAP}
+CONTROLLERMAXMEM: ${CONTROLLERMAXMEM}
SCRIPTPLAN: ${SCRIPTPLAN}
CONFIGPLAN: ${CONFIGPLAN}
STREAMTESTPLAN: ${STREAMTESTPLAN}
LBAAS_SERVICE_PROVIDER: ${LBAAS_SERVICE_PROVIDER}
ODL_SFC_DRIVER: ${ODL_SFC_DRIVER}
ODL_SNAT_MODE: ${ODL_SNAT_MODE}
+GROUP_ADD_MOD_ENABLED: ${GROUP_ADD_MOD_ENABLED}
EOF
}
echo "collect_logs: for opendaylight controller ip: ${!CONTROLLERIP}"
NODE_FOLDER="odl_${i}"
mkdir -p "${NODE_FOLDER}"
- echo "Lets's take the karaf thread dump again..."
+ echo "Let's take the karaf thread dump again..."
ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}"/ps_after.log
pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}"/ps_after.log | grep -v grep | tr -s ' ' | cut -f2 -d' ')
echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
function get_features() {
if [ "${CONTROLLERSCOPE}" == 'all' ]; then
- ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
- export CONTROLLERMEM="3072m"
+ if [ "$KARAF_PROJECT" == "integration" ]; then
+ ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
+ else
+ ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}"
+ fi
+ # if CONTROLLERMEM still is the default 2G and was not overridden by a
+ # custom job, then we need to make sure to increase it because "all"
+ # features can be heavy
+ if [ "${CONTROLLERMEM}" == "2048m" ]; then
+ export CONTROLLERMEM="3072m"
+ fi
else
ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}"
fi
sed -ie "s/\\(featuresBoot=\\|featuresBoot =\\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
fi
-FEATURE_TEST_STRING="features-integration-test"
-KARAF_VERSION=${KARAF_VERSION:-karaf4}
-if [[ "$KARAF_VERSION" == "karaf4" ]]; then
- FEATURE_TEST_STRING="features-test"
+FEATURE_TEST_STRING="features-test"
+FEATURE_TEST_VERSION="$BUNDLE_VERSION"
+if [[ "$KARAF_ARTIFACT" == "opendaylight" ]]; then
+ FEATURE_TEST_VERSION="$(sed -r "s%^([0-9]+)\.([0-9]+)\.0(.*)%0.\1.\2\3%" <<<"$BUNDLE_VERSION")"
fi
+KARAF_VERSION=${KARAF_VERSION:-karaf4}
-sed -ie "s%\\(featuresRepositories=\\|featuresRepositories =\\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.1.0/xml/features,%g" ${FEATURESCONF}
-if [[ ! -z "${REPO_URL}" ]]; then
- sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
+# only manipulate feature repo in integration distro
+if [[ "$KARAF_PROJECT" == "integration" ]]; then
+ sed -ie "s%\\(featuresRepositories=\\|featuresRepositories =\\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/\${FEATURE_TEST_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.2.0/xml/features,%g" ${FEATURESCONF}
+ if [[ ! -z "${REPO_URL}" ]]; then
+ sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
+ fi
fi
cat ${FEATURESCONF}
# This workaround is required for Karaf decanter to work proper
# The bundle:refresh command does not fail if the decanter bundles are not present
-echo "ssh to karaf console to do bundle refresh of decanter jmx collector"
-sshpass -p karaf ssh -o StrictHostKeyChecking=no \
- -o UserKnownHostsFile=/dev/null \
- -o LogLevel=error \
- -p 8101 karaf@localhost \
- "bundle:refresh org.apache.karaf.decanter.collector.jmx && bundle:refresh org.apache.karaf.decanter.api"
+# There seems to be impact in silicon stream so we better comment the lines below
+#
+#echo "ssh to karaf console to do bundle refresh of decanter jmx collector"
+#sshpass -p karaf ssh -o StrictHostKeyChecking=no \
+# -o UserKnownHostsFile=/dev/null \
+# -o LogLevel=error \
+# -p 8101 karaf@localhost \
+# "bundle:refresh org.apache.karaf.decanter.collector.jmx && bundle:refresh org.apache.karaf.decanter.api"
if [[ "$USEFEATURESBOOT" != "True" ]]; then
# if we ended up not finding ready status in the above loop, we can output some debugs
grep 'org.opendaylight.infrautils.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
-if [ $? -ne 0 ]; then
+if [ \$? -ne 0 ]; then
echo "Timeout Controller DOWN"
echo "Dumping first 500K bytes of karaf log..."
head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
function dump_controller_threads() {
for i in $(seq 1 "${NUM_ODL_SYSTEM}"); do
CONTROLLERIP="ODL_SYSTEM_${i}_IP"
- echo "Lets's take the karaf thread dump"
+ echo "Let's take the karaf thread dump"
ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}"/ps_before.log
pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}"/ps_before.log | grep -v grep | tr -s ' ' | cut -f2 -d' ')
echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
${SSH} "${ip}" "sudo yum -y install createrepo && createrepo --database /tmp/ovs_rpms"
install_ovs_from_repo "${ip}" file:/tmp/ovs_rpms
}
-
-