Adjust CSIT for UM projects

UM projects can use Managed distribution (SNAPSHOT or Release)
and add their own feature repo in their csit jjb file.

This is much better than using local distribution.

Change-Id: Ib5d08347f809129157f95fa29b36a87c2416adf6
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh
index ee18f254061a97139c1158faee4ee820f26b3810..f0ba1efc4129f64e729f092ddb405c296460729f 100644 (file)
--- a/jjb/integration/integration-configure-clustering.sh
+++ b/jjb/integration/integration-configure-clustering.sh
@@ -69,7 +69,7 @@ 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}
+sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot@id=opendaylight-snapshot@snapshots, https://nexus.opendaylight.org/content/repositories/public@id=opendaylight-mirror, 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..."
@@ -81,6 +81,9 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then
 fi
 
 sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = 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}
+if [[ ! -z "${REPO_URL}" ]]; then
+   sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
+fi
 cat ${FEATURESCONF}
 
 if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 423420abafcc83088b3528a21f1bd92edd098610..f4d56ac2def12c4b64bbc8790608a04188dba5a2 100644 (file)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -56,7 +56,7 @@ 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}
+sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot@id=opendaylight-snapshot@snapshots, https://nexus.opendaylight.org/content/repositories/public@id=opendaylight-mirror, 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}
 
 if [[ "$USEFEATURESBOOT" == "True" ]]; then
@@ -70,6 +70,9 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then
 fi
 
 sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = 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}
+if [[ ! -z "${REPO_URL}" ]]; then
+   sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
+fi
 cat ${FEATURESCONF}
 
 if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index c5c8125f66263c59a18c5721882771c42f5b38fc..3933b0cd989e42049a612d199baf83f0da891530 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -27,6 +27,14 @@
           default: '{bundle-url}'
           description: 'URL to karaf distribution zip'
 
+- parameter:
+    name: integration-repo-url
+    parameters:
+      - string:
+          name: REPO_URL
+          default: '{repo-url}'
+          description: 'URL to feature repo artifact'
+
 - parameter:
     name: integration-jdk-version
     parameters:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index bac9e13d229c5471cff74a1a0976c5725fa44393..92db8923445cc26cecf5aea6447143979634ad84 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -56,6 +56,8 @@
           stream: '{verify-stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
@@ -146,6 +148,8 @@
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -267,6 +271,8 @@
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -495,6 +501,8 @@
           stream: '{verify-stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
@@ -588,6 +596,8 @@
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -703,6 +713,8 @@
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -818,6 +830,8 @@
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -1048,6 +1062,8 @@
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
       - integration-controller-debug-map:
@@ -1253,6 +1269,8 @@
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
       - integration-controller-debug-map:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index cc31c2a77e0a60d0194309980e1f2a4595132b11..0e3ef318bf28728a8ab473bd3a8a3829eb5b5334 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -67,6 +67,7 @@
 
     # Distribution bundle URL
     bundle-url: 'last'
+    repo-url: ''
 
     # CSIT images configuration
     openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 00cbb34b56daea39ce6cc38c371d59cc00a99a5e..32f2fea771e467af5543570f75020b2254fb4b65 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml
index 36f1dd602a2ddfa7e0863e0020230f64dccdb150..3f73956b42fc5caace02170f6156bfe241673881 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-routing.yaml
+++ b/jjb/sxp/sxp-csit-cluster-routing.yaml
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index e337efc73f05463c3e3a2d374ffca3f894585aa6..4ffc77f52c411e6d81401c80a0aaaae853a71414 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index 5325dea6d6c5c53aeb302b4a89ade204fd73cfac..1c18ccd314298a46970f952e1d1b14ab65838686 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index 377d24949a6590c7942330462c549161c28e5c33..19599a919c877dcc2c59cc30aa9183b27fd2fa28 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 74147dfdde57e17dd1fd6f71d808c85f27e2e193..28abaf89d3d86ccf7bf4f78a1e7044cb6dc931a6 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index 4c418656e22e0e01777d98b44e28f8efc87be261..a43ce024c75d3beacfa16ac30e0d9b54d77e94ad 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -17,7 +17,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/usc/job/usc-merge-fluorine/lastBuild/org.opendaylight.usc$usc-karaf/artifact/org.opendaylight.usc/usc-karaf/1.6.0-SNAPSHOT/usc-karaf-1.6.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 46781e36cd802e089f67054a426ccca268e12ae3..ca04c7f2d62aa361e2280c09a8ada5a273d7b189 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -15,6 +15,8 @@
     stream:
       - fluorine:
           branch: 'master'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen: