X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt.yaml;h=c132094708e9dffd9981dac42e178f83434e50cf;hb=d3d228364902a5aa5c7ffb0ff8133ce28ebb5f27;hp=2a3d122ea47cf71d302d1b4645d0f8be6291c3f3;hpb=1ef9643a39534ba4624d0c50fc1e5f5de9cd1526;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 2a3d122ea..c13209470 100644
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: netvirt
+    name: netvirt-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -11,18 +11,21 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
           rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
       - gerrit-tox-verify
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: aluminium
+    branch: 'master'
 
     project: 'netvirt'
     project-name: 'netvirt'
+
+    java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    mvn-opts: '-Xmx2048m'
     build-timeout: 90
     build-node: centos7-builder-8c-8g
     dependencies: >
@@ -30,47 +33,124 @@
         neutron-merge-{stream},
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
 - project:
-    name: netvirt-vpp
+    name: netvirt-magnesium
     jobs:
-      - gerrit-maven-verify
+      - '{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
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: magnesium
+    branch: 'stable/magnesium'
 
-    stream: vpp
     project: 'netvirt'
     project-name: 'netvirt'
-    branch: 'topic/vpp'
-    karaf-version: karaf3
-    distribution_branch: 'master'
+
+    java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
-    dependencies:
-    email-upstream: '[netvirt]'
+    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}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
+
+    # 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}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
+
+    # Used by the release job
+    staging-profile-id: a67da0ffbb1ba
 
 - project:
     name: netvirt-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
+- project:
+    name: netvirt-csit-view
+    views:
+      - csit-view
+    view-name: netvirt-csit
+    view-description: 'List of netvirt-csit jobs'
+    view-regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
 
-- view:
+- project:
     name: netvirt
-    description: 'List of netvirt jobs'
-    regex: '^netvirt-.*'
-    <<: *releng_view_common
-
-- view:
-    name: netvirt-csit
-    description: 'List of netvirt-csit jobs'
-    regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
-    <<: *integration_view_csit
+    jobs:
+      - gerrit-info-yaml-verify
+    project: netvirt
+    project-name: netvirt-info
+    build-node: centos7-builder-2c-1g
+
+- project:
+    name: netvirt-view
+    views:
+      - project-view
+    project-name: netvirt