X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-check-bootup.sh;h=a02b91bf58a328fa68a9b4dc04647fdb182e8a76;hb=7e5ac390fa1b22be301ea5ca1f975a63acf89019;hp=2ed4fa1d8b193e81fc89119026e801a2fd0e1376;hpb=7e78e8b952ce4952d20cd9a0f456ee8ca98f3298;p=releng%2Fbuilder.git diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh index 2ed4fa1d8..a02b91bf5 100644 --- a/jjb/integration/distribution/distribution-check-bootup.sh +++ b/jjb/integration/distribution/distribution-check-bootup.sh @@ -36,11 +36,15 @@ unzip -q "${BUNDLE}" echo "Configuring the startup features..." FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg" 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 # only replace feature repo in integration/distro, MRI projects need to pull in # the features they need by themselves if [[ "$KARAF_PROJECT" == integration ]]; then - sed -ie "s%\(featuresRepositories= \|featuresRepositories = \)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}//xml/features,%g" "${FEATURESCONF}" + sed -ie "s%\(featuresRepositories= \|featuresRepositories = \)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${FEATURE_TEST_VERSION}/xml/features,%g" "${FEATURESCONF}" if [[ -n "${REPO_URL}" ]]; then # sed below will fail if it finds space between feature repos.