Merge "Support openjdk11 in CSIT magnesium"

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 03e6d8ae89b9286c84401063dfc0a01c970cb87c..5fad26068819c7040bd7e92aa6b948492c0aec7e 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -13,10 +13,6 @@
 
     # Project branches
     stream:
-      - magnesium:
-          branch: 'master'
-      - sodium:
-          branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
       - fluorine:

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index 9d55e968e61ceb954e2b38b0809ead1be4793382..c7d58fdb70674c1b703dfdba8c6cb95550b5eb89 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -10,6 +10,7 @@
       - magnesium:
           branch: 'master'
           os-branch: 'queens'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           os-branch: 'queens'

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index 969ab49350d05bb74c5c56e27b0decbcdd1141d5..09ff941e2396462cf1bd1e90bde178111b9c6489 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index b8940a236dc81fea3c64abcaa3995c925bee5993..109e823f790e76d43aa837b78657c4c0cab56d12 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 47a276034714267a3d16c71ade28b2c86ad27405..fa77fa9b024563e64dacff56bb64f0f705097e32 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index d829e552c547ea0229dacc8570864e8cde592d7d..f2b17e3de0db796aadf967be77a815f528a87621 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index 768761b44e11ddd3225a2014d865af77004769a6..76fb276cfc18b3b26ede95fef2eb3b860cab95fa 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 6c6253997fc4769dd27245353bc7913f594cce0a..4da67667d4e6bc3dd7a2181adf134b244d5d3457 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 88c449b8f07abfe04cafc2a4c19ec377b05e7e5f..aa4b2072faf938a6ec54db7fa23175da489a1098 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 0f1f802139b7b64ba969ad5b4a5094ce6ea4aad9..d98e8d871bc998fcb951e07476aca8e2b07dafe0 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -3,7 +3,6 @@
     name: bgpcep-csit-userfeatures
     jobs:
       - inttest-csit-1node
-      - inttest-csit-verify-1node
 
     # The project name
     project: 'bgpcep'
@@ -17,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
index 7430d14da323b02f8125bf7caecef8bbf2907889..d7cd48b41ab972140f0be201baf4c7da3f8f9b8b 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -11,6 +11,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index 3a675458812060d8ce4576f199099f774bdd761f..a74244dd76ae4a89167d38e12c33ce09ae226c3b 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index e20b5a8ad645299bc42cb03bc9144373f12dd2ff..f5064107fc4e91c62725563a0958c5a71808d05a 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -13,6 +13,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index b4f1a779f7bdd337624942eb81798785487b723e..3d11e1bb54dc6a5fe3fb9e13e721a42e59a745e5 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -12,6 +12,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index 2785ba227d1d34799a6edb845dd954a8c72a2593..33ac88f185a11c46e2723aebbbc9fa5c8faeecf0 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 52d1a160e16d33915bb86220a19c845589e8c6df..0007997c33f0de50a9f27bb003c211dd26a865f2 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
index 52080dd9387c1af4094f150db763571657d35707..2e39dc6db477c17a82051d9f6cb3cf24f1ca921f 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 38aec200540d8d0304977de6c6f957a434e67401..8889f04a7c22cb8afd1bc3d8b99441373736dd45 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index c8b7eea0d17c515389a4748a78dada81dcd793a4..6e7f726b5547c698b0bb890252cccde3940f5938 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 694d53c74d1db66a861153521f1c96bda23f4397..d301d1b42c01e098f3dff5c871d10ca7a657b269 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 825849eef073a33c60953f215325022446fc0710..27f0dc9d5e7e53d2f44a65ae3656be702a31c933 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index 8270c5a57731e2915fc2cd7b91d3e3579ebc0b55..b2d3db5ba2aa2ad2c5d67fdc980b413d37f455e8 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index f9185af2779f8a49f11110e92cc6d4cfb575e0a1..6d9ea122cf96a45e6eeafc93898842000385f3c7 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index 39d1e3dc6d53c8d980e743dd4bb854117f92ed9f..9cd25961570141c3ff3c3e379285b8a315cf82ba 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml
index 9b519a2d69ca34a6a8e3b787fe0c45b3354222d9..418e620105835c0cb14c12cda4a114c7ea86f33d 100644 (file)
--- a/jjb/controller/controller-patch-test.yaml
+++ b/jjb/controller/controller-patch-test.yaml
@@ -10,6 +10,7 @@
       - magnesium:
           branch: 'master'
           os-branch: 'queens'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           os-branch: 'queens'

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 7b769aaf8d35f09b65fa37a94082c3b3c98f2027..4eaf840daefc7b9ffa642413c8c8c1a88578d6c8 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index 28d7317c4980947b1683e4188e05311915070443..e291685ce962466971ec33f0d45e9c2185d9ae09 100644 (file)
--- a/jjb/daexim/daexim-csit-clustering-basic.yaml
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index 1041a18c941699784e082b6c985fb5123c6c1ad4..a539ccae776adc24a14b2560c6130db5ffa71591 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index ceb1a1a139c9da9d23c2fcea861bd766d12344d7..8daeff5ced7c1d1f7a4093d7d7238490200a1a1b 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -18,6 +18,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 278c3f1a2811bad8c3b613b233cfa8884faaab1b..d61f6ceef8b6475ce83bc6d497dffc36959e1b60 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -10,6 +10,7 @@
       - magnesium:
           branch: 'master'
           os-branch: 'queens'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           os-branch: 'queens'
@@ -20,8 +21,6 @@
           branch: 'stable/fluorine'
           os-branch: 'queens'
 
-    jdk: 'openjdk8'
-
     feature:
       - netvirt:
           csit-list: >

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 39a1eb13bb791798d09d52c76a0f34078732453d..ef7bb3cf656f1ea9c675737a9d0f481bae4ecce1 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -22,6 +22,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 6445646fd3bfc259f297e3ff3d87ae5f11557911..55c545e4ce4b5795fb888948c52020b09bb88599 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index fe81914e88e7c0f4d030c1e5541f71ba131e5a0b..571420bfd183f970b15d2b208f1c53890a1f3526 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index 8ee86a956c44c97a92cef1eb03a4cb6e20ba36f4..769973843348dc80e9f67955cefdda60178ed367 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index bb1737d185b69e326f661f600958f6501cd92b2d..9236a74b0aee577e2a8634a2016c868dac3df79e 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index f7cded29ee6f57682e483a66931236507748978d..bf52804f8249ad43bafa5a4625ab539b5bb6ce8f 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/integration/integration-set-variables.sh b/jjb/integration/integration-set-variables.sh
index a61dbc992d3b7e050b7b7dcf70627f716371cdc2..76e8d726321eb8487926a30f686edb567730a4c6 100644 (file)
--- a/jjb/integration/integration-set-variables.sh
+++ b/jjb/integration/integration-set-variables.sh
@@ -10,7 +10,7 @@ fi
 
 if [ "$JDKVERSION" == 'openjdk11' ]; then
     echo "Preparing for JRE Version 11"
-    JAVA_HOME="/opt/jdk-11"
+    JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
 elif [ "$JDKVERSION" == 'openjdk8' ]; then
     echo "Preparing for JRE Version 8"
     JAVA_HOME="/usr/lib/jvm/java-1.8.0"

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index ea6e693498ae741fd3b27347fd1ff152e78bf243..072e29560ae88e8111591ac55673f0d80b382e23 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -17,6 +17,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index 678479910a9f2aefc02fafa4667f3adc848e0155..634a48581a17a54ee55d1c97427820b8bfd744c4 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 3a785761ade4c78348e751310347c654de63b3b3..fc8cd0325499a89dd11f8e2dfd6090178d8162f6 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index a30448d1d48cd65fe8c1cb27dffabc73d4cea611..094d4fa242c8bb6fc22825896be222098df34721 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index 10905d551dc6e9459a1d763527691467a8bc71db..655a2e3105b044cef19af5201dd6d0beb74299f8 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -13,6 +13,7 @@
       - magnesium:
           branch: 'master'
           os-branch: 'queens'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           os-branch: 'queens'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 964854a20aefb7b717426eea376d31d81ae7678b..0ac20cb59926f62c5003147cf0bb4e7138d47e43 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index ad2c1da82ca7811caabeee9df86a77d79c4efe2a..ad612a7d3a69ed1554f5c29e186d314fb576e7b3 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index e44d1e523ba084e5c7a4f77817d9d66f5fdb8a1a..9f34180d8eac38a8a97b823b217bab3684bf7ebe 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml
index 9f6dfa48ada3b0417316416eedcbd5d7f2e6fdd9..3b49e2316bcb279b738b627df51a29659d36344a 100644 (file)
--- a/jjb/mdsal/mdsal-patch-test.yaml
+++ b/jjb/mdsal/mdsal-patch-test.yaml
@@ -10,6 +10,7 @@
       - magnesium:
           branch: 'master'
           os-branch: 'queens'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           os-branch: 'queens'

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index 9545dab9e339a2170b6edbefb92083d3fc0b469e..dc92bd0751cfabd92e2ef1af7d67c450d9c2b462 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index c1cb19f9338b70942b5ef02ae9f11d9aee4d3ffc..a59ae159304955b963beb6bd895b1191b73b54c8 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index af9921d664e02e30a3daa341748ad82e6222aebd..843e86562d1016eab4847650a9df8eec7490849c 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 8a7c1faec3bb37ca009358218d1e727bf77ed11b..207d220fde78b1baa22b69688acc433ead1ad70c 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml
index eb07b3c71b317180aa618a22aad3edb45947c1dd..c028eda54ca3d2a48ae14c3974a8e0b184d9fa38 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -10,6 +10,7 @@
       - magnesium:
           branch: 'master'
           os-branch: 'queens'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           os-branch: 'queens'

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 1e8170ff72d42edf26b2eeaa5ef5f93eb85670f5..e4b0c9adf84ce6f5d25b7fc356a968473292048c 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:
@@ -51,8 +52,11 @@
 
     # Project branches
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
       - fluorine:

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 07b0467346be18244e4819657fc28fae3d598dad..b4d2755839e0d265bd84f74347b6bf55e12e5a4b 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -3,7 +3,6 @@
     name: netconf-csit-userfeatures
     jobs:
       - inttest-csit-1node
-      - inttest-csit-verify-1node
 
     # The project name
     project: 'netconf'
@@ -17,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 0d01ff951ffeac921c36b02b3d098fd8506dbb5b..2c8554c07b36411d05077b422d78f15c07b5d0fc 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -7,6 +7,7 @@
     project: 'netvirt'
     stream: 'magnesium'
     branch: 'master'
+    jre: 'openjdk11'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'

diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml
index e9f579d28ad4d4f7ca19de57c73aec78432e0b08..a68bffc947b4fb1e6dc56f486adb816f8b005de5 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -10,6 +10,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index fbd6f88cfe75263017610870920a42de90b86a22..7115941069d8db1c450fac6b8f0a36e14c05866a 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -7,6 +7,7 @@
     project: 'netvirt'
     stream: 'magnesium'
     branch: 'master'
+    jre: 'openjdk11'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
@@ -376,6 +377,7 @@
       - magnesium:
           branch: 'master'
           ovs-install: 'v2.9.2'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           ovs-install: 'v2.9.2'

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 3b1f711f35ec572d02969f6efcf73f0600bce393..a17c4e9834a245bab2b01b07fd7599c1b398bc20 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -10,6 +10,7 @@
       - magnesium:
           branch: 'master'
           os-branch: 'queens'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           os-branch: 'queens'

diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml
index 0a705927a8973cbc83aacc779c88e481d3fdd120..66343af5abfed460da6597a891b900daecf0bf09 100644 (file)
--- a/jjb/odltools/odltools-csit.yaml
+++ b/jjb/odltools/odltools-csit.yaml
@@ -12,6 +12,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
index 5aa37ff8128a26f027a98b3bbc6736a9f06188ce..5778ff09fa2e7d919d2cbb32cfb72f8210b11bff 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
@@ -12,6 +12,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 7f6c06b152b5860a336920838b5683d0142e96ce..ec0b0b2d6349e4133ad807751e94c4460ba246b5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 14ceaaf2828c6268406fb5557732de704ed319d2..a88b2c576b7b735be17ef23f34ee68e14f959c41 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 3b27711e9544257de99a430ac1930e0a77ed872f..71e5d56f8f180a4baefcce5990e0e73490a50f3f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index c53e2a1fd7046dfd963b0bc0e9c24a684ad6071f..7fdcac46ecd1e45bb5826db38d7c229285980c95 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 02fdb435b734df3b41cfb87e3c0a6523fab59730..28b95d8b7d0d81d3f999b79e03904e5205ec81c7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index d452031e2bc889b8fce9ca0bd73d61e553a96db8..f7e1660a2c8f5ef7f6f43499eb7bb801e6399163 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index ce261c60e1517d5332fd1386f1278c3561e7b9e9..4c2e1851bf6b106a4da346cffd5545a40485c344 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index cfd329647229d2cba2f1634d7258580e98393863..25f57e3a48a4fe3b51f191a856134598e00f2828 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index b4344555850118b8fb05bb639750baf4242212ec..af1f5d8039823749c633dac57dce5716df766f7c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 08331109810de47c4986a02309875935b34f1084..3d9d8cd95b4f5e6073c4f7770c746096d39069ba 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 8cac147f2fcd50a46b82639f126ec5296d990516..bb5e84fcb0fe7b33d2d5102a197639dce2d7b54f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 737b583ab2d0a74116fc0450efc9ede464a7ff60..f4db3f2698babff092a5a4099e0f5c3cb81c2b16 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 4fdf5c1aa256d616f2b5dd612e3f0be2c935b651..7def71e92ac8ba19ce43e977467faad4b242689b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -12,6 +12,7 @@
       - magnesium:
           branch: 'master'
           os-branch: 'queens'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           os-branch: 'queens'

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 4333d12b6dddccc98bc1beccdd185401b8f5ab10..e0a9b439d835f143a2e312c3af193c0484271d97 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -3,7 +3,7 @@
     name: ovsdb-csit-clustering
     jobs:
       - inttest-csit-3node
-      - inttest-csit-verify-3node
+
     # The project name
     project: 'ovsdb'
 
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index ee8797aa3b3a36fe2e0b414ea76d3b21999f889d..23380aa2fab671f7cda0602437d62416811045fc 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -3,7 +3,7 @@
     name: ovsdb-csit-southbound
     jobs:
       - inttest-csit-1node
-      - inttest-csit-verify-1node
+
     # The project name
     project: 'ovsdb'
 
@@ -16,6 +16,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 89ac7decb700b013c732f89626f06db89a566550..0be8fbece938833617fd45bb87ca7ef59e628b83 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -11,6 +11,7 @@
       - magnesium:
           branch: 'master'
           os-branch: 'queens'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           os-branch: 'queens'

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index 7130b9c4685964d9042506f5acf19d97954e0256..36cad0dce0833ada0532b6b57ace7fa5925b91e3 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -17,6 +17,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml
index 9fd1ab5068c56a96f17fa54f9fe28807eac43dfb..38a86ec25178ef886d0db328b6ef3f84336a1adc 100644 (file)
--- a/jjb/sfc/sfc-csit-full-deploy.yaml
+++ b/jjb/sfc/sfc-csit-full-deploy.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index 7fe2cfbfc18e3e6a2945afd73ad50d6b32b8c344..f73bb5941950c13d3b3647c8c864d604072fa305 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml
index c70783595b8ae967fa9a741b77d976b4c607317f..67d5e2bc6e3ac3bbc98e9237d4448edea7da4a7b 100644 (file)
--- a/jjb/sfc/sfc-patch-test.yaml
+++ b/jjb/sfc/sfc-patch-test.yaml
@@ -12,6 +12,7 @@
       - magnesium:
           branch: 'master'
           os-branch: 'queens'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           os-branch: 'queens'

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 7641777abd2f9715a72a25903016027156250a89..183652c4426a0a1aa6caf2ef16e7246c3770fa6d 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml
index 49a7df2773a3f9c29ebe50d1b2079aedf0464224..f48f71d6576b7048903da827accc5a0b9f5197be 100644 (file)
--- a/jjb/sxp/sxp-csit-binding-origin.yaml
+++ b/jjb/sxp/sxp-csit-binding-origin.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml
index 9e35536b08e94715868b4842b52ab1dc75175b86..b240155942d710c400610bef8e344c07312dcdc9 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-binding.yaml
+++ b/jjb/sxp/sxp-csit-cluster-binding.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index cb1205100c931f90b3af5a939458785fe5ecf76e..4fff57357c810518fa497ad726aefa18ad699d86 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index 2805a33d2a365465d97fc4f775dd2d11a20b8d7a..118f672191593fb5c401d60c9d5f8c2c5189df60 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index e69af885d2bac2ec689541c5b6b80e45f0a47061..5b1b9447c3dd55b9db01e1d2da181f5fd4d329d4 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index fb17a7b77f5797b2f4d895f3ece5d9de1b94fac7..1a4556fdf3b84ecf0fe2a1b8f9982092e2033311 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml
index 6428cbedf680627dcc069e85fa0133c39fea2797..cc17f29bcfc3b13116e0bc36a15abc50feea652a 100644 (file)
--- a/jjb/telemetry/telemetry-csit-basic.yaml
+++ b/jjb/telemetry/telemetry-csit-basic.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index 3a2ac553ad00f0cf97e5f70990cd861e1993fd13..97cc0b01efac4eb63d45645e5ed916efc968ca05 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
index 516c12762a5519190edf86288149733612f1e870..90b26a97c11de81ab7184366804c0a2a46a4bfda 100644 (file)
--- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml
+++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index 6ee8f009d4c0b11da9bc3cfc23d897ba8bc41ace..c24db7d8447aafc0fe1e4ad74ba098f37ba953bf 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 7220fe63f4087499a4bb8070f8efdce27a736e93..8bb55ce28de6bbc8166a6da8ce9a47a974165d73 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 0a214570237c513453567d5548518090b9654e9f..cc4c0dbf7a429908ae1c95af3180ec52ed125b3a 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -15,6 +15,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 35a54f71b5a2704b6ee37c26d42820ae780b7f46..d36c44acebd30e5a8b6903c41d028207ca60e6f6 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -14,6 +14,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml
index cb3f01f53ed90341f111c6442019215e0c492096..223073a17382f7e02e3296a474778dd8aecc8616 100644 (file)
--- a/jjb/yangtools/yangtools-patch-test.yaml
+++ b/jjb/yangtools/yangtools-patch-test.yaml
@@ -10,6 +10,7 @@
       - magnesium:
           branch: 'master'
           os-branch: 'queens'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
           os-branch: 'queens'