Merge "Remove references to distribution-deploy-*"

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index f4f348edc26745d876e2a0421dfe222a5d44c86b..2252e679e5b0118ce86dead50f862a9f6a7d2295 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,76 +1,46 @@
 ---
 - project:
-    name: neutron-neon
+    name: neutron-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - "{project-name}-maven-javadoc-jobs"
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: neon
-    project: 'neutron'
-    project-name: 'neutron'
+    stream: master
+    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: "openjdk17"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
+    email-upstream: "[neutron] [odlparent] [aaa]"
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-fluorine
+    name: neutron-sonar
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - odl-sonar-jobs-jdk17
 
-    stream: fluorine
-    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]'
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
+    project: "neutron"
+    project-name: "neutron"
+    branch: "master"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
 
 - project:
-    name: neutron-oxygen
+    name: neutron-info
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 90
-    branch: 'stable/oxygen'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
+      - gerrit-info-yaml-verify
+    project: neutron
+    project-name: neutron
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
-    name: neutron-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'neutron'
-    project-name: 'neutron'
-    branch: 'master'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- view:
-    name: neutron
-    description: 'List of neutron jobs'
-    regex: '^neutron-.*'
-    <<: *releng_view_common
+    name: neutron-view
+    views:
+      - project-view
+    project-name: neutron