CI!: Rm silicon jobs from Jenkins

[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 5f0878d93c0389d723285bc4a194b6118a6a36e1..5b0d208a0862ed018645a845d165d8cee1db5d3e 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -24,14 +24,15 @@
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          mvn-version: mvn38
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
       - phosphorus:
           branch: "stable/phosphorus"
-      - silicon:
-          branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
+          mvn-version: mvn35
 
 - project:
     name: distribution-managed
@@ -57,54 +58,33 @@
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          mvn-version: mvn38
           dependencies: >
-            bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - phosphorus:
-          branch: "stable/phosphorus"
-          dependencies: >
-            bgpcep-maven-merge-{stream},
-            daexim-maven-merge-{stream},
-            jsonrpc-maven-merge-{stream},
-            lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            neutron-maven-merge-{stream},
-            openflowplugin-maven-merge-{stream},
-            ovsdb-maven-merge-{stream},
-            serviceutils-maven-merge-{stream},
-      - silicon:
-          branch: "stable/silicon"
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
           dependencies: >
-            bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          mvn-version: mvn35
           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},
@@ -130,20 +110,19 @@
     karaf-version: odl
     dist-pom: "distribution/opendaylight/pom.xml"
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          mvn-version: mvn38
           dependencies: >
             distribution-merge-managed-{stream},
-      - phosphorus:
-          branch: "stable/phosphorus"
-          dependencies: >
-            distribution-merge-managed-{stream},
-      - silicon:
-          branch: "stable/silicon"
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
           dependencies: >
             distribution-merge-managed-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          mvn-version: mvn35
           dependencies: >
             distribution-merge-managed-{stream},
 
@@ -166,14 +145,15 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
-      - phospshorus:
+          mvn-version: mvn38
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
+      - phosphorus:
           branch: "stable/phosphorus"
-      - silicon:
-          branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
+          mvn-version: mvn35
 
 - project:
     name: distribution-sonar
@@ -184,6 +164,7 @@
     project-name: distribution
     branch: master
     java-version: "openjdk11"
+    mvn-version: mvn38
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-opts: "-Xmx1024m"