From 220fce8277e373d66650ff82d4b48497f976aab6 Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Fri, 29 Sep 2017 13:40:16 -0700 Subject: [PATCH] Use proper feature strings in case of karaf3 or 4 Change-Id: Ie45b2450d663f99e4d4bbde52a7a8b0fb2aabd73 Signed-off-by: Jamo Luhrsen --- .../integration-deploy-controller-run-test.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index 04a4c8f59..ecba48eec 100644 --- a/jjb/integration/integration-deploy-controller-run-test.sh +++ b/jjb/integration/integration-deploy-controller-run-test.sh @@ -54,7 +54,15 @@ echo "Configuring the startup features..." FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" \${FEATURESCONF} -sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features%g" \${FEATURESCONF} + +FEATURE_INDEX_STRING="features-integration-index" +FEATURE_TEST_STRING="features-integration-test" +if [[ "$KARAF_VERSION" == "karaf4" ]]; then + FEATURE_INDEX_STRING="features-index" + FEATURE_TEST_STRING="features-test" +fi + +sed -ie "s%mvn:org.opendaylight.integration/\${FEATURE_INDEX_STRING}/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/\${FEATURE_INDEX_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features%g" \${FEATURESCONF} cat \${FEATURESCONF} if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then -- 2.36.6