Merge "Remove Ubuntu 18.04 ovs 2.5 config"

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 1506a995bd2c491fa47ae6e739443acfb6ed4061..ba922436475b3e34bc12f5f79b256376c97e729d 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -15,7 +15,7 @@
     stream:
       - phosphorus:
           branch: "master"
-          integration-test: silicon
+          integration-test: phosphorus
       - silicon:
           branch: "stable/silicon"
           integration-test: silicon

diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh
index 84ea9ea6e10378054a6f192971763b0ddc3bb617..0cd69a969ff69afc6f09ebbcf49cfa6769ba919d 100644 (file)
--- a/jjb/integration/distribution/distribution-check-bootup.sh
+++ b/jjb/integration/distribution/distribution-check-bootup.sh
@@ -35,7 +35,7 @@ if [[ "$KARAF_VERSION" == "karaf3" ]]; then
     FEATURE_TEST_STRING="features-integration-test"
 fi
 
-sed -ie "s%\(featuresRepositories= \|featuresRepositories = \)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,%g" "${FEATURESCONF}"
+sed -ie "s%\(featuresRepositories= \|featuresRepositories = \)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}//xml/features,%g" "${FEATURESCONF}"
 
 if [[ -n "${REPO_URL}" ]]; then
    # sed below will fail if it finds space between feature repos.