Merge "Do not trigger distribution-merge by controller"

[releng/builder.git] / jjb / netvirt / netvirt.yaml

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 74f1d606889cee2750ed796156e83a6756ae118d..639c230e98d91165af97c038b7bb208ffe89aa28 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: netvirt-magnesium
+    name: netvirt-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -12,57 +12,18 @@
           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
 
-    stream: magnesium
+    stream: aluminium
     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'
+    java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx2048m'
     build-timeout: 90
@@ -72,15 +33,14 @@
         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-neon
+    name: netvirt-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -91,17 +51,19 @@
           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
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: neon
-    branch: 'stable/neon'
+    stream: magnesium
+    branch: 'stable/magnesium'
 
     project: 'netvirt'
     project-name: 'netvirt'
+
+    java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx2048m'
     build-timeout: 90
@@ -111,15 +73,14 @@
         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-fluorine
+    name: netvirt-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -136,8 +97,8 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: fluorine
-    branch: 'stable/fluorine'
+    stream: sodium
+    branch: 'stable/sodium'
 
     project: 'netvirt'
     project-name: 'netvirt'
@@ -150,9 +111,8 @@
         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
@@ -165,6 +125,7 @@
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx1024m'
 
@@ -176,6 +137,14 @@
     view-description: 'List of netvirt-csit jobs'
     view-regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
 
+- project:
+    name: netvirt
+    jobs:
+      - gerrit-info-yaml-verify
+    project: netvirt
+    project-name: netvirt-info
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: netvirt-view
     views: