Set the correct Jenkins user as Git email

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 3f3de316aeb5e33e23946ae2411fe65dda34206f..e64a81554a8888eff4c49dbfc167714400baf483 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,85 +1,65 @@
 ---
 - project:
-    name: neutron-oxygen
+    name: neutron-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: aluminium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    java-version: 'openjdk11'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-nitrogen
+    name: neutron-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: nitrogen
+    stream: magnesium
     project: 'neutron'
     project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-timeout: 90
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-carbon
+    name: neutron-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: carbon
+    stream: sodium
     project: 'neutron'
     project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-timeout: 90
+    branch: 'stable/sodium'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
@@ -91,6 +71,25 @@
     project: 'neutron'
     project-name: 'neutron'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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
+    views:
+      - project-view
+    project-name: neutron