Merge "Update the CentOS7 builder to the latest"

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 57d8973e118ba454fbbb5aac715c0166011b5a2c..b4e2f177e9738fe983569699bc8b210212a9aa73 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -8,8 +8,10 @@
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     stream: magnesium
     project: 'aaa'

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 3bc5bc158a81e354c7d3eed0e0226ba2c1560916..f3c1f3019692dbeac9dc4805e0f6173ebafd2b4a 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -9,8 +9,10 @@
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     stream: magnesium
     project: 'bgpcep'

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index fcab50d23eaaf03fa4d91f1eb030fe0b3df6603e..d80a240af8a9f21fbfc4cb1fe950fdba6784e66b 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -8,8 +8,10 @@
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
           rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     project: 'coe'
     project-name: 'coe'

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 7fca1f9a9520b78e9225114602c7ac02ee02b103..f33649775ea769bc3fe56d7b81e58d1663d248b0 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -8,8 +8,10 @@
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     stream: magnesium
     project: 'controller'

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 712837e66665b2bea6dd9795cb6b075c5e7123da..f4edd79171811f1d52b661454ea6faf427b181bf 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -8,8 +8,10 @@
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     project: 'daexim'
     project-name: 'daexim'

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 45fe54fd487cfab914c5afab3294b668efac7075..d8ccd698b46ed53ba534a60e2941f8122652d4c4 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -9,8 +9,10 @@
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index d0a2349f8b64110fc7279fadc27021280beef608..8232415aed79801d5cfaa6220bef1398b26243e2 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -10,8 +10,10 @@
           project-pattern: infrautils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     stream: magnesium
     project: 'infrautils'

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 8ac937f957317bbd8bc5b0e4536a91de140b7dd0..67d5c5d732229923b67d175aad130ad1c5ad95b3 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -8,8 +8,10 @@
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     stream: magnesium
     project: 'netconf'

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 709e9fd98eb50d212227688f4e73489a34229191..74f1d606889cee2750ed796156e83a6756ae118d 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,6 +1,125 @@
 ---
 - project:
-    name: netvirt
+    name: netvirt-magnesium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: netvirt
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
+          rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
+      - gerrit-tox-verify
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: magnesium
+    branch: 'master'
+
+    project: 'netvirt'
+    project-name: 'netvirt'
+    mvn-settings: 'netvirt-settings'
+    mvn-opts: '-Xmx2048m'
+    build-timeout: 90
+    build-node: centos7-builder-8c-8g
+    dependencies: >
+        genius-merge-{stream},
+        neutron-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        ovsdb-merge-{stream},
+        sfc-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+
+    # Used by the release job
+    staging-profile-id: a67da0ffbb1ba
+
+- project:
+    name: netvirt-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: netvirt
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
+          rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
+      - gerrit-tox-verify
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
+    branch: 'stable/sodium'
+
+    project: 'netvirt'
+    project-name: 'netvirt'
+    mvn-settings: 'netvirt-settings'
+    mvn-opts: '-Xmx2048m'
+    build-timeout: 90
+    build-node: centos7-builder-8c-8g
+    dependencies: >
+        genius-merge-{stream},
+        neutron-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        ovsdb-merge-{stream},
+        sfc-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+
+    # Used by the release job
+    staging-profile-id: a67da0ffbb1ba
+
+- project:
+    name: netvirt-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: netvirt
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
+          rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
+      - gerrit-tox-verify
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: neon
+    branch: 'stable/neon'
+
+    project: 'netvirt'
+    project-name: 'netvirt'
+    mvn-settings: 'netvirt-settings'
+    mvn-opts: '-Xmx2048m'
+    build-timeout: 90
+    build-node: centos7-builder-8c-8g
+    dependencies: >
+        genius-merge-{stream},
+        neutron-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        ovsdb-merge-{stream},
+        sfc-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+
+    # Used by the release job
+    staging-profile-id: a67da0ffbb1ba
+
+- project:
+    name: netvirt-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -17,15 +136,8 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream:
-      - magnesium:
-          branch: 'master'
-      - sodium:
-          branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
+    stream: fluorine
+    branch: 'stable/fluorine'
 
     project: 'netvirt'
     project-name: 'netvirt'

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 10c2a8164c56c6023e1e03bf205bbb45aa847e0c..f2bb81ab3be28984351486e12d720857e0cc520e 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -4,8 +4,10 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     stream: magnesium
     project: 'neutron'

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 24ab553bd7c58594db0a71e15338dc8dae039036..3e487fd61b5c90b65dfb5e4b5522f0ff627c5718 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -10,8 +10,10 @@
           project-pattern: openflowplugin
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 487a7eda0281d376e58d50e91dc633f79662f389..0608f9cb3c42b1bbdc0427766346fc212ec0f932 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -9,8 +9,10 @@
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 566bc9705e43ee1ea67d03d578a299ba48c0ad41..f6d1616508c060a7935deb2d830177d7c1d20121 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,6 +1,104 @@
 ---
 - project:
-    name: serviceutils
+    name: serviceutils-magnesium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: serviceutils
+          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
+
+    branch: 'master'
+    stream: magnesium
+
+    project: 'serviceutils'
+    project-name: 'serviceutils'
+    build-node: centos7-builder-2c-2g
+    mvn-settings: 'serviceutils-settings'
+    mvn-opts: '-Xmx1024m'
+    build-timeout: 90
+    dependencies: >
+        controller-merge-{stream},
+        yangtools-merge-{stream},
+        odlparent-merge-{stream},
+        infrautils-merge-{stream}
+    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
+
+    # Used by the release job
+    staging-profile-id: 12cc4ba8bf01ba
+
+- project:
+    name: serviceutils-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: serviceutils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
+          rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    branch: 'stable/sodium'
+    stream: sodium
+
+    project: 'serviceutils'
+    project-name: 'serviceutils'
+    build-node: centos7-builder-2c-2g
+    mvn-settings: 'serviceutils-settings'
+    mvn-opts: '-Xmx1024m'
+    build-timeout: 90
+    dependencies: >
+        controller-merge-{stream},
+        yangtools-merge-{stream},
+        odlparent-merge-{stream},
+        infrautils-merge-{stream}
+    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
+
+    # Used by the release job
+    staging-profile-id: 12cc4ba8bf01ba
+
+- project:
+    name: serviceutils-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: serviceutils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
+          rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    branch: 'stable/neon'
+    stream: neon
+
+    project: 'serviceutils'
+    project-name: 'serviceutils'
+    build-node: centos7-builder-2c-2g
+    mvn-settings: 'serviceutils-settings'
+    mvn-opts: '-Xmx1024m'
+    build-timeout: 90
+    dependencies: >
+        controller-merge-{stream},
+        yangtools-merge-{stream},
+        odlparent-merge-{stream},
+        infrautils-merge-{stream}
+    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
+
+    # Used by the release job
+    staging-profile-id: 12cc4ba8bf01ba
+
+- project:
+    name: serviceutils-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -12,15 +110,8 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream:
-      - magnesium:
-          branch: 'master'
-      - sodium:
-          branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
+    branch: 'stable/fluorine'
+    stream: fluorine
 
     project: 'serviceutils'
     project-name: 'serviceutils'

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 4ab2ba40ecadfa2136b6eb33176e775c77bc0f3d..11de8f039a74dc3a3962d97805dec1abff18fdd8 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -8,8 +8,10 @@
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
     stream: magnesium
     project: 'sfc'