Make bgpcep jobs run with its mri distro

Signed-off-by: Tomas Cere <tomas.cere@pantheon.tech>
Change-Id: I5bb099af2b6c58d1296adcb76f67d7353475dcc8

diff --git a/global-jjb b/global-jjb
index e3b4365df52fdf3fdd6abe86a7fcc4b06c29e181..599b705c033b73a5565027db210960ae7658f9f5 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit e3b4365df52fdf3fdd6abe86a7fcc4b06c29e181
+Subproject commit 599b705c033b73a5565027db210960ae7658f9f5

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 2f97fe8509952ca55f00c3b34026ac5ecdbfe4b1..2a090e753229841959d4b87ee3c538d256cdee43 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -24,6 +24,8 @@
           branch: "stable/silicon"
           jre: "openjdk11"
 
+    karaf-version: bgpcep
+
     install:
       - all:
           scope: "all"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 37851551e4d35700f8e8fe3559c83a23d889022b..a6770a3305dfad0867e7510b31190318373086c4 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -23,6 +23,8 @@
           branch: "stable/silicon"
           jre: "openjdk11"
 
+    karaf-version: bgpcep
+
     install:
       - all:
           scope: "all"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 94ef8475e3fc02d979eb93fd153f7c1f8b431ed8..051180a1c625e00f0bfcab69f3380da30bdbff2f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -22,6 +22,8 @@
           branch: "stable/silicon"
           jre: "openjdk11"
 
+    karaf-version: bgpcep
+
     install:
       - only:
           scope: "only"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index ab916a36be4dc24c3cde36e15262d3da2f203bfa..d456b32a94746fd75af71f57c6a182bd5448482d 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -25,6 +25,8 @@
           branch: "stable/silicon"
           jre: "openjdk11"
 
+    karaf-version: bgpcep
+
     install:
       - only:
           scope: "only"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index deb75fafd62a0d5432ecbf56bb5c5b4c7f36ef08..cbafe6cd3b647f21e30dca61d619ad239b62a50f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -22,6 +22,8 @@
           branch: "stable/silicon"
           jre: "openjdk11"
 
+    karaf-version: bgpcep
+
     install:
       - all:
           scope: "all"

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index a8ec64e00d809c2e08bebc295a12609b8809cb0d..78df04b4c7a8a5746a5af071882c1faa29b58147 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -24,6 +24,8 @@
           branch: "stable/silicon"
           jre: "openjdk11"
 
+    karaf-version: bgpcep
+
     install:
       - all:
           scope: "all"

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index d34ffae527c56f0cf6fda49a23551deea81bc519..9283f789e32ed26d42e51bab8a55541640927367 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -24,6 +24,8 @@
           branch: "stable/silicon"
           jre: "openjdk11"
 
+    karaf-version: bgpcep
+
     install:
       - all:
           scope: "all"

diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
index e15aa935300d7e2ace9d520da63ecde0f9f39b2b..19be5fea0936fa75c0f649779ffc4f713d1b0cb8 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-patch-test
     jobs:
-      - inttest-patch-test
+      - inttest-mri-patch-test
 
     # The project name
     project: "bgpcep"
@@ -19,6 +19,8 @@
           branch: "stable/silicon"
           java-version: "openjdk11"
 
+    karaf-version: bgpcep
+
     feature:
       - bgp:
           csit-list: >

diff --git a/jjb/integration/integration-compare-distributions.sh b/jjb/integration/integration-compare-distributions.sh
index 040b6cfa3f92715c54e6253fc05e124c05fd4d5f..9dfede50fd0e4880ff448401c642e0fcd5f0bca1 100644 (file)
--- a/jjb/integration/integration-compare-distributions.sh
+++ b/jjb/integration/integration-compare-distributions.sh
@@ -19,6 +19,8 @@ elif [[ "$KARAF_ARTIFACT" == "netconf-karaf" ]]; then
     wget "http://${GERRIT_PATH}/gitweb?p=${KARAF_PROJECT}.git;a=blob_plain;f=karaf/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
 elif [[ "$KARAF_ARTIFACT" == "controller-test-karaf" ]]; then
     wget "http://${GERRIT_PATH}/gitweb?p=${KARAF_PROJECT}.git;a=blob_plain;f=karaf/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+elif [[ "$KARAF_ARTIFACT" == "bgpcep-karaf" ]]; then
+    wget "http://${GERRIT_PATH}/gitweb?p=${KARAF_PROJECT}.git;a=blob_plain;f=distribution-karaf/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
 else
     wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
 fi

diff --git a/jjb/integration/integration-detect-variables.sh b/jjb/integration/integration-detect-variables.sh
index fddb2f9670396a5b9bc1778e4fe2f2d1d563c829..baaf7183dd8cf698cbf0696eec7ca36cc1a32574 100644 (file)
--- a/jjb/integration/integration-detect-variables.sh
+++ b/jjb/integration/integration-detect-variables.sh
@@ -15,6 +15,8 @@ if [ "${BUNDLE_URL}" == 'last' ]; then
         wget "http://${GERRIT_PATH}/gitweb?p=${KARAF_PROJECT}.git;a=blob_plain;f=karaf/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
     elif [[ "$KARAF_ARTIFACT" == "controller-test-karaf" ]]; then
         wget "http://${GERRIT_PATH}/gitweb?p=${KARAF_PROJECT}.git;a=blob_plain;f=karaf/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+    elif [[ "$KARAF_ARTIFACT" == "bgpcep-karaf" ]]; then
+        wget "http://${GERRIT_PATH}/gitweb?p=${KARAF_PROJECT}.git;a=blob_plain;f=distribution-karaf/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
     else
         wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
     fi

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index c89d032197090c19303283f17fc23e5f8064b316..4f4718e5d6d4711e1abf804719ab03dea283dc1a 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -100,7 +100,7 @@
       - string:
           name: KARAF_VERSION
           default: "{karaf-version}"
-          description: "karaf3, karaf4, odl, controller, netconf affects ODL deploy scripts"
+          description: "karaf3, karaf4, odl, bgpcep, controller, netconf affects ODL deploy scripts"
 
 - parameter:
     name: integration-bundle-url

diff --git a/jjb/integration/integration-set-variables.sh b/jjb/integration/integration-set-variables.sh
index 45bf097cc9ffa700e31ec777113c2b0868de2f0b..e51c626e06ded575368f935fc6b067494a39398f 100644 (file)
--- a/jjb/integration/integration-set-variables.sh
+++ b/jjb/integration/integration-set-variables.sh
@@ -12,6 +12,9 @@ elif [[ "$KARAF_VERSION" == "controller" ]]; then
 elif [[ "$KARAF_VERSION" == "netconf" ]]; then
     KARAF_ARTIFACT="netconf-karaf"
     KARAF_PROJECT="netconf"
+elif [[ "$KARAF_VERSION" == "bgpcep" ]]; then
+    KARAF_ARTIFACT="bgpcep-karaf"
+    KARAF_PROJECT="bgpcep"
 else
     KARAF_ARTIFACT="karaf"
     KARAF_PROJECT="integration"