Merge "Update cloud image CentOS7 robot x86_64"

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 23f7620ca81b19c5dea9201f47a2914e425f2e57..2986e88b0f27eb8406a3171357286a43747c16a9 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,61 +1,87 @@
 ---
 - project:
-    name: neutron-sodium
+    name: neutron-silicon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: sodium
-    project: 'neutron'
-    project-name: 'neutron'
+    stream: silicon
+    project: "neutron"
+    project-name: "neutron"
     build-timeout: 90
-    branch: 'master'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[neutron] [odlparent] [aaa]"
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-neon
+    name: neutron-aluminium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: "neutron"
+    project-name: "neutron"
+    build-timeout: 90
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[neutron] [odlparent] [aaa]"
+
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
 
-    stream: neon
-    project: 'neutron'
-    project-name: 'neutron'
+- project:
+    name: neutron-magnesium
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: "neutron"
+    project-name: "neutron"
     build-timeout: 90
-    branch: 'stable/neon'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[neutron] [odlparent] [aaa]"
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-fluorine
+    name: neutron-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
-    project: 'neutron'
-    project-name: 'neutron'
+    stream: sodium
+    project: "neutron"
+    project-name: "neutron"
     build-timeout: 90
-    branch: 'stable/fluorine'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-    disable-job: true
+    branch: "stable/sodium"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[neutron] [odlparent] [aaa]"
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
@@ -64,11 +90,25 @@
     name: neutron-sonar
     jobs:
       - gerrit-maven-sonar
-    project: 'neutron'
-    project-name: 'neutron'
-    branch: 'master'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "neutron"
+    project-name: "neutron"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "neutron-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}"
+
+- project:
+    name: neutron-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: neutron
+    project-name: neutron
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: neutron-view