X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-deploy-controller-run-test.sh;h=2daad05695b07cd0f82a7dcc7c808ffcb6886993;hb=99c81a81f8573f87affa9e1a68f92b83556480ce;hp=b8eaf06ddb0d09582e85c656ddbb012c636b0424;hpb=603cc656570c8ccab1f6f7217f77e7db30797f88;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index b8eaf06dd..2daad0569 100644 --- a/jjb/integration/integration-deploy-controller-run-test.sh +++ b/jjb/integration/integration-deploy-controller-run-test.sh @@ -5,6 +5,7 @@ # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091 source ${ROBOT_VENV}/bin/activate +MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg @@ -23,7 +24,7 @@ if [ ${CONTROLLERSCOPE} == 'all' ]; then CONTROLLERMEM="3072m" COOLDOWN_PERIOD="180" else - ACTUALFEATURES="${CONTROLLERFEATURES}" + ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}" COOLDOWN_PERIOD="60" fi @@ -54,6 +55,10 @@ wget --progress=dot:mega '${ACTUAL_BUNDLE_URL}' echo "Extracting the new controller..." unzip -q ${BUNDLE} +echo "Adding external repositories..." +sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF} +cat ${MAVENCONF} + echo "Configuring the startup features..." sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}