X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt.yaml;h=3082deb687c42f2f883a93d0dcb823b6b3a564ee;hb=b839a835f780cf9a899ca4275ae92f1e4aee5578;hp=c132094708e9dffd9981dac42e178f83434e50cf;hpb=6d6d1587319565527cf6de0677a7e34b83a12c6e;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index c13209470..3082deb68 100644
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: netvirt-aluminium
+    name: netvirt-silicon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-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
@@ -14,27 +14,61 @@
       - 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"
+
+    project: "netvirt"
+    project-name: "netvirt"
+
+    java-version: "openjdk11"
+    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-aluminium
+    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
 
     stream: aluminium
-    branch: 'master'
+    branch: "stable/aluminium"
 
-    project: 'netvirt'
-    project-name: 'netvirt'
+    project: "netvirt"
+    project-name: "netvirt"
 
-    java-version: 'openjdk11'
-    mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m'
+    java-version: "openjdk11"
+    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]'
+      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
@@ -42,9 +76,9 @@
 - project:
     name: netvirt-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-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
@@ -54,27 +88,24 @@
       - 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'
+    branch: "stable/magnesium"
 
-    project: 'netvirt'
-    project-name: 'netvirt'
+    project: "netvirt"
+    project-name: "netvirt"
 
-    java-version: 'openjdk11'
-    mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m'
+    java-version: "openjdk11"
+    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]'
+      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
@@ -82,9 +113,9 @@
 - project:
     name: netvirt-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-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
@@ -94,25 +125,22 @@
       - 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'
+    branch: "stable/sodium"
 
-    project: 'netvirt'
-    project-name: 'netvirt'
-    mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m'
+    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]'
+      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
@@ -122,24 +150,24 @@
     jobs:
       - gerrit-maven-sonar
 
-    project: 'netvirt'
-    project-name: 'netvirt'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "netvirt"
+    project-name: "netvirt"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "netvirt-settings"
+    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}'
+    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-description: "List of netvirt-csit jobs"
+    view-regex: "netvirt-csit(?!(.*gate)|(.*hwvtep)).*"
 
 - project:
     name: netvirt