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 82ae533cfeacbc05351b4efac82a805f30894a82..2252e679e5b0118ce86dead50f862a9f6a7d2295 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,65 +1,19 @@
 ---
 - project:
-    name: neutron-silicon
+    name: neutron-master
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: silicon
+    stream: master
     project: "neutron"
     project-name: "neutron"
     build-timeout: 90
     branch: "master"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     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-aluminium
-    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
-
-- 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/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
@@ -68,17 +22,13 @@
 - project:
     name: neutron-sonar
     jobs:
-      - gerrit-maven-sonar
+      - odl-sonar-jobs-jdk17
+
     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