Merge "Install packages one at a time"

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 4a270e2214ef88011b036100b2fb6b634991b445..379aeb37e9790b65080f347f2841fbc46fb80e5f 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -9,14 +9,13 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     stream: magnesium
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -84,6 +83,7 @@
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m'
 

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 8ae2754822711ce2ee107d0fd6535ba5a27a08fc..8c1614b4eea344f3cb8bdaddc5605a0e19cb7bf1 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -10,14 +10,13 @@
           mvn-goals: clean install -V -Dmaven.compile.fork=true
       - gerrit-maven-stage:
           sign-artifacts: true
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     stream: magnesium
     project: 'archetypes'
     project-name: 'archetypes'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'archetypes-settings'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
@@ -79,6 +78,7 @@
     project: 'archetypes'
     project-name: 'archetypes'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'archetypes-settings'
 
 - project:

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 46c75fbb1e23ca3a1377fec16f34a4ceec5add2d..3e4f0688af5e109c8799f4afd9eff776b051537d 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -78,7 +78,7 @@
         -Dcheckstyle.skip=true
         -Dskip.karaf.featureTest=true
         -Dsft.heap.max=4g
-    java-version: openjdk11
+    java-version: 'openjdk11'
 
 - project:
     name: autorelease-view

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 09234977e68fa72ef6e085cc8225f510d4c82c50..a13b03118e9e33e7f6051c7bd101049b5e3746dc 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -10,9 +10,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     stream: magnesium
     project: 'bgpcep'
@@ -20,6 +18,7 @@
     build-node: centos7-builder-8c-8g
     build-timeout: 120
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx2048m'
     dependencies: >
@@ -108,6 +107,7 @@
     build-node: centos7-builder-8c-8g
     build-timeout: 120
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx1024m'
 

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index fc4d5ded50ad75491684d87f6f91af1d72ea3690..33d6a5ce11285153f6bc20fe7bd6538830c46dca 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -9,14 +9,13 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
           rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     project: 'coe'
     project-name: 'coe'
     stream: magnesium
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -84,6 +83,7 @@
     project: 'coe'
     project-name: 'coe'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m'
 

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 7815e672d9670194f5e696655632288932482d65..543f84bcfc9f4bffee495b341c7a5a434b255ccf 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -3,21 +3,19 @@
     name: controller-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}':
-          java-version: openjdk11
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     stream: magnesium
     project: 'controller'
     project-name: 'controller'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
@@ -96,6 +94,7 @@
     project-name: 'controller'
     branch: master
     build-node: centos7-builder-8c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 0d0fc2fe50719158879b5618afabc314770f2be8..f63e557dd8280cd7cdab26ae46264a90a52fe1b3 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -9,14 +9,13 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     project: 'daexim'
     project-name: 'daexim'
     stream: magnesium
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -81,6 +80,7 @@
     project: 'daexim'
     project-name: 'daexim'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m'
 

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index ae5e22a810559079b35fa1acf2fb00bfc54d112a..e0c98e504e9aa1baa65ff155777c0ab72a96e3c2 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -10,9 +10,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
@@ -22,6 +20,7 @@
     project-name: 'genius'
     branch: 'master'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m'
     build-timeout: 90
@@ -114,6 +113,7 @@
     project-name: 'genius'
     branch: 'master'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m'
 

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index d3859f04b104158b914618e6faa8ab76c138184c..18ec7c823f4ab413c6aa6082880c27313bccc30a 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -11,14 +11,13 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     stream: magnesium
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
@@ -86,6 +85,7 @@
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m'
 

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 5e8451b5fe130c556ac7fe710cbf815b1a1f27cd..65387ddfd713a63d9b53634476d86215d27d3fb3 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -23,7 +23,7 @@
     stream:
       - magnesium:
           branch: 'master'
-          java-version: openjdk11
+          java-version: 'openjdk11'
           karaf-version: odl
       - sodium:
           branch: 'stable/sodium'
@@ -70,7 +70,7 @@
     stream:
       - magnesium:
           branch: 'master'
-          java-version: openjdk11
+          java-version: 'openjdk11'
           dependencies: >
               aaa-maven-merge-{stream},
               bgpcep-maven-merge-{stream},
@@ -149,7 +149,7 @@
     stream:
       - magnesium:
           branch: 'master'
-          java-version: openjdk11
+          java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
@@ -186,7 +186,7 @@
     stream:
       - magnesium:
           branch: 'master'
-          java-version: openjdk11
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:
@@ -200,6 +200,7 @@
     project: integration/distribution
     project-name: distribution
     branch: master
+    java-version: 'openjdk11'
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index d3b8cab99d90521beac2bc4fd0fda0429e8e81ef..30d5c9916e375b42df300cfb91994dab5de54b31 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -21,7 +21,7 @@
       - magnesium:
           branch: 'master'
           mvn-version: 'mvn35'
-          java-version: openjdk11
+          java-version: 'openjdk11'
           csit-list: !include: csit-jobs-magnesium.lst
           build-order: >
               odlparent yangtools mdsal infrautils controller serviceutils aaa netconf

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 56b278a0a840286eeb6ac2bb3b7cd345f0e76bf8..3e8ada5dc668f0cd815a3dcd6d3356ebffceee70 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -10,6 +10,7 @@
     build-timeout: 60
     stream: any
     branch: '*'
+    python-version: python2
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 909a411999233129dacfbd2fe4a8dbe1d1be775a..0b99c46c51cded90957ed0c4c81d7810153650db 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -10,14 +10,13 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     stream: magnesium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy -DrepoBuild'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -105,6 +104,7 @@
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy -DrepoBuild'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 0d524a42352d057f1962d03d7d253df10a6b3655..42c96da4eca5b3d3195911c3d172d30e2c0cbfff 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -9,15 +9,14 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
           rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     project: mdsal
     project-name: mdsal
     branch: master
     stream: master
 
+    java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
 
@@ -102,7 +101,6 @@
     name: mdsal-sonar
     jobs:
       - gerrit-maven-sonar:
-          java-version: openjdk11
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
@@ -112,6 +110,7 @@
     project-name: 'mdsal'
     branch: 'master'
     build-node: centos7-builder-8c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 00eaf282c64d2a25b1731549c911c591b1cfcd32..8a308cb73e6adf04e19db90b7c2250b7d658df12 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -9,15 +9,14 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     stream: magnesium
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -94,6 +93,7 @@
     project-name: 'netconf'
     branch: 'master'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 55c7f9bfebbe1102813ef3920f14235d15b17ab4..03c1962adc7370193f10f7e405f09c5f63117c22 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -12,9 +12,7 @@
           rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
       - gerrit-tox-verify
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
@@ -24,6 +22,8 @@
 
     project: 'netvirt'
     project-name: 'netvirt'
+
+    java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx2048m'
     build-timeout: 90
@@ -126,6 +126,7 @@
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx1024m'
 

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index e9547ccb85d1a2e613abe3aed8c837d77aa01a3f..6ece2ce8b88ab5e685bcfa32e3b5232e99e17006 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -5,15 +5,14 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     stream: magnesium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
@@ -71,6 +70,7 @@
     project: 'neutron'
     project-name: 'neutron'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m'
 

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 432e109e1266fe88ce6da682d3ff2398035c109d..b0f64babd60ed842b3d1a562b9f5a27eb871e17a 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -10,9 +10,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
           rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
       - gerrit-tox-verify
 
     project: odlparent
@@ -20,6 +18,7 @@
     stream: master
     branch: master
 
+    java-version: 'openjdk11'
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m'
     mvn-version: mvn35
@@ -131,7 +130,6 @@
     name: odlparent-sonar
     jobs:
       - gerrit-maven-sonar:
-          java-version: openjdk11
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
@@ -139,6 +137,7 @@
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'odlparent-settings'
     mvn-opts: '-Xmx1024m'
 

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 9b0dc30f8e9057c14433720fc789da2f57479f6d..fbcc00bb268a6f73fd16a1cdccfc08c67300230c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -11,9 +11,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
@@ -24,6 +22,7 @@
     branch: 'master'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
+    java-version: 'openjdk11'
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m'
@@ -119,6 +118,7 @@
     branch: 'master'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
+    java-version: 'openjdk11'
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 7d16ab172a22fcd5160b1684533602c1241059bb..1a9736ff9c6a01d8f2cd1ec8b597d74c4e5aec9d 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -10,9 +10,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
@@ -22,6 +20,7 @@
     project-name: 'ovsdb'
     branch: 'master'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 9cc030279abc68abb82e577e8003acf5df851238..953cc6941fc60e4069999ddad589dfbdebbf7e68 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -10,9 +10,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     branch: 'master'
     stream: magnesium
@@ -20,6 +18,7 @@
     project: 'serviceutils'
     project-name: 'serviceutils'
     build-node: centos7-builder-2c-2g
+    java-version: 'openjdk11'
     mvn-settings: 'serviceutils-settings'
     mvn-opts: '-Xmx1024m'
     build-timeout: 90
@@ -106,6 +105,7 @@
     project-name: 'serviceutils'
     branch: 'master'
     build-node: centos7-builder-4c-4g
+    java-version: 'openjdk11'
     mvn-settings: 'serviceutils-settings'
     mvn-opts: '-Xmx1024m'
 

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 2a662843ef0666553b38200e309b0a4b421e4916..7d539580df00ec66eb3747be242f0994dde73f59 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -9,14 +9,13 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     stream: magnesium
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     build-timeout: 120
@@ -86,6 +85,7 @@
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
 

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 0316e6ed156e4c54c0f4c35436a03af5dd50dc3b..1bfd5310201a708d19480dfafad9566ef1193ac9 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -11,8 +11,7 @@
       - odl-maven-verify-jobs
       - gerrit-release-merge
 
-    java-version:
-      - openjdk11
+    java-version: 'openjdk11'
 
     stream: magnesium
     project: 'sxp'
@@ -91,6 +90,7 @@
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m'
 

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 02359c7ac27400c5f01b3ad356393d4616c9755c..37a2f3336b8ccac5fcfb1ad22f95cb0298ee9a15 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -4,15 +4,14 @@
     jobs:
       - 'gerrit-release-merge'
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
     branch: master
     stream: master
 
+    java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
 
     dependencies: ''
@@ -113,7 +112,6 @@
     name: yangtools-sonar
     jobs:
       - gerrit-maven-sonar:
-          java-version: openjdk11
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
@@ -122,6 +120,7 @@
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'