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 2bd13426c8a70130a99efccfea06b829ac1247a1..1c4fdb1b1c238026de6e754ac57f1b4956c6210e 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,90 +1,50 @@
 ---
 - project:
-    name: neutron-oxygen
+    name: neutron-master
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - "{project-name}-maven-javadoc-jobs"
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: oxygen
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 60
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
+    stream: master
+    project: "neutron"
+    project-name: "neutron"
+    build-timeout: 90
+    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-nitrogen
+    name: neutron-sonar
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: nitrogen
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
+      - 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-carbon
+    name: neutron-info
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: carbon
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
+      - gerrit-info-yaml-verify
+    project: neutron
+    project-name: neutron
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
-    name: neutron-sonar
-    jobs:
-      - '{project-name}-sonar'
-    project: 'neutron'
-    project-name: 'neutron'
-    branch: 'master'
-    mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    name: neutron-view
+    views:
+      - project-view
+    project-name: neutron