Feat!: Remove all stable/aluminium jobs

[releng/builder.git] / jjb / integration / distribution / distribution-jobs.yaml

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index dc75bac573c239843cfebdebfc32b6edf763b5ce..37083f18b99e383d728736a4725ac23778299e25 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -17,24 +17,19 @@
     mvn-settings: integration-distribution-settings
     mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
     mvn-opts: "-Xmx1024m"
+    java-version: openjdk11
+    jre: "openjdk11"
+    karaf-version: odl
     nexus-iq-namespace: odl-
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - silicon:
+      - sulfur:
           branch: "master"
-          java-version: openjdk11
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: openjdk11
-          jre: "openjdk11"
-          karaf-version: odl
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: openjdk11
-          jre: "openjdk11"
-          karaf-version: odl
+      - phosphorus:
+          branch: "stable/phosphorus"
+      - silicon:
+          branch: "stable/silicon"
 
 - project:
     name: distribution-managed
@@ -54,59 +49,44 @@
     type: managed
     profile: "-Pmanaged"
     forbidden-files: "opendaylight/**"
+    java-version: "openjdk11"
+    jre: "openjdk11"
     karaf-version: karaf4
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - silicon:
+      - sulfur:
           branch: "master"
-          java-version: "openjdk11"
-          jre: "openjdk11"
           dependencies: >
-            aaa-maven-merge-{stream},
             bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
-            genius-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
             netconf-maven-merge-{stream},
-            netvirt-maven-merge-{stream}
             neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
-          jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
           dependencies: >
-            aaa-maven-merge-{stream},
             bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
-            genius-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
             netconf-maven-merge-{stream},
-            netvirt-maven-merge-{stream}
             neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
-          jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
           dependencies: >
-            aaa-maven-merge-{stream},
             bgpcep-maven-merge-{stream},
-            controller-maven-merge-{stream},
             daexim-maven-merge-{stream},
-            genius-maven-merge-{stream},
-            infrautils-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
             netconf-maven-merge-{stream},
-            netvirt-maven-merge-{stream}
             neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
@@ -129,26 +109,20 @@
     type: full
     profile: "-Punmanaged"
     files: "opendaylight/**"
+    java-version: "openjdk11"
     karaf-version: odl
     dist-pom: "distribution/opendaylight/pom.xml"
-
     stream:
-      - silicon:
+      - sulfur:
           branch: "master"
-          java-version: "openjdk11"
-          karaf-version: odl
           dependencies: >
             distribution-merge-managed-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
-          karaf-version: odl
+      - phosphorus:
+          branch: "stable/phosphorus"
           dependencies: >
             distribution-merge-managed-{stream},
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
-          karaf-version: odl
+      - silicon:
+          branch: "stable/silicon"
           dependencies: >
             distribution-merge-managed-{stream},
 
@@ -164,21 +138,19 @@
     mvn-goals: "clean deploy -f opendaylight/pom.xml"
     mvn-settings: "integration-distribution-settings"
     mvn-opts: "-Xmx1024m"
+    java-version: "openjdk11"
     email-upstream: "[int/dist]"
 
     # Used by the release job
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - silicon:
+      - sulfur:
           branch: "master"
-          java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
+      - phospshorus:
+          branch: "stable/phosphorus"
+      - silicon:
+          branch: "stable/silicon"
 
 - project:
     name: distribution-sonar