Merge "Remove defunct patch-tests"

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

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 769d2791912566710b250eb5a614409d75fd3f96..7bd3b90a502c57d9901671a034bc30ab53f05c02 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -3,7 +3,7 @@
     name: p4plugin-sulfur
     jobs:
       - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: sulfur
@@ -22,7 +22,7 @@
     name: p4plugin-phosphorus
     jobs:
       - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: phosphorus
@@ -41,7 +41,7 @@
     name: p4plugin-silicon
     jobs:
       - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: silicon
@@ -56,25 +56,6 @@
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
-- project:
-    name: p4plugin-aluminium
-    jobs:
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "p4plugin"
-    project-name: "p4plugin"
-    branch: "stable/aluminium"
-    mvn-settings: "p4plugin-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: ""
-    email-upstream: "[p4plugin]"
-
-    # Used by the release job
-    staging-profile-id: a68bf26e208d4
-
 - project:
     name: p4plugin-release-management
     jobs: