function get_features() {
if [ "${CONTROLLERSCOPE}" == 'all' ]; then
- ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
+ 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
FEATURE_TEST_STRING="features-test"
fi
-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.2.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}/${BUNDLE_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