Merge "Update cloud image"

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

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index eb051ddd242d78d3e3d32c71ecbe688c52c955ca..69d950cdcd538e86d9de200b433481bbe2696f09 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -14,9 +14,6 @@
       - 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
     branch: "master"
 
@@ -54,9 +51,6 @@
       - 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"
 
@@ -94,9 +88,6 @@
       - 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"
 
@@ -119,44 +110,6 @@
     # 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: