Branch cut for stable/silicon stream

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

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index eb051ddd242d78d3e3d32c71ecbe688c52c955ca..056fbac0150e2197ba9ddba1732d7a596970b0b0 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,8 +1,7 @@
 ---
 - project:
-    name: netvirt-silicon
+    name: netvirt-phosphorus
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -14,10 +13,7 @@
       - 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: silicon
+    stream: phosphorus
     branch: "master"
 
     project: "netvirt"
@@ -34,15 +30,16 @@
       openflowjava-merge-{stream},
       openflowplugin-merge-{stream},
       ovsdb-merge-{stream}
-    email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]"
+    email-upstream:
+      "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\
+      \ [ovsdb]"
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
 - project:
-    name: netvirt-aluminium
+    name: netvirt-silicon
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -54,11 +51,8 @@
       - 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: aluminium
-    branch: "stable/aluminium"
+    stream: silicon
+    branch: "stable/silicon"
 
     project: "netvirt"
     project-name: "netvirt"
@@ -74,13 +68,15 @@
       openflowjava-merge-{stream},
       openflowplugin-merge-{stream},
       ovsdb-merge-{stream}
-    email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]"
+    email-upstream:
+      "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\
+      \ [ovsdb]"
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
 - project:
-    name: netvirt-magnesium
+    name: netvirt-aluminium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -94,11 +90,8 @@
       - 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: aluminium
+    branch: "stable/aluminium"
 
     project: "netvirt"
     project-name: "netvirt"
@@ -114,13 +107,15 @@
       openflowjava-merge-{stream},
       openflowplugin-merge-{stream},
       ovsdb-merge-{stream}
-    email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]"
+    email-upstream:
+      "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\
+      \ [ovsdb]"
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
 - project:
-    name: netvirt-sodium
+    name: netvirt-magnesium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -131,17 +126,16 @@
           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: sodium
-    branch: "stable/sodium"
+    stream: magnesium
+    branch: "stable/magnesium"
 
     project: "netvirt"
     project-name: "netvirt"
+
+    java-version: "openjdk11"
     mvn-settings: "netvirt-settings"
     mvn-opts: "-Xmx2048m"
     build-timeout: 90
@@ -152,7 +146,9 @@
       openflowjava-merge-{stream},
       openflowplugin-merge-{stream},
       ovsdb-merge-{stream}
-    email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]"
+    email-upstream:
+      "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\
+      \ [ovsdb]"
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba