Merge "Update cloud image Ubuntu18.04 mininet ovs"

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 6ece2ce8b88ab5e685bcfa32e3b5232e99e17006..1c4fdb1b1c238026de6e754ac57f1b4956c6210e 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,78 +1,47 @@
 ---
 - project:
-    name: neutron-magnesium
+    name: neutron-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
-    project: 'neutron'
-    project-name: 'neutron'
+    stream: master
+    project: "neutron"
+    project-name: "neutron"
     build-timeout: 90
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
+    email-upstream: "[neutron] [odlparent] [aaa]"
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-sodium
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: sodium
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 90
-    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
-
-- project:
-    name: neutron-neon
+    name: neutron-sonar
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 90
-    branch: 'stable/neon'
-    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
+      - gerrit-maven-sonar
+    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-sonar
+    name: neutron-info
     jobs:
-      - gerrit-maven-sonar
-    project: 'neutron'
-    project-name: 'neutron'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m'
+      - gerrit-info-yaml-verify
+    project: neutron
+    project-name: neutron
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: neutron-view