X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=0fdb9d5593dc955b7f898afdc3c6e56fc4cb2ddd;hb=5f2492cae9fcc63fc22648f7fb1a553513eb5cd2;hp=36dd6ba9bf6374aed929e787b5d19133340397db;hpb=17e405080849c714581eaeb98ad4b20dae1f3ea9;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 36dd6ba9b..0fdb9d559 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -3,11 +3,11 @@
     name: distribution
     jobs:
       # gerrit- is generic template, distribution- is project specific.
-      - 'distribution-sanity-{stream}'
+      - "distribution-sanity-{stream}"
       - gerrit-maven-clm
       - gerrit-maven-verify-dependencies
       - gerrit-tox-verify
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           project-pattern: integration/distribution
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-distribution/34591/
           rtd-token: 6247e7a21158a20b207470b8bf7719c676ff8944
@@ -15,149 +15,176 @@
     project: integration/distribution
     project-name: distribution
     mvn-settings: integration-distribution-settings
-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m'
+    mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
+    mvn-opts: "-Xmx1024m"
     nexus-iq-namespace: odl-
     nexus-iq-stage: release
-    email-upstream: '[int/dist]'
+    email-upstream: "[int/dist]"
     stream:
+      - silicon:
+          branch: "master"
+          java-version: openjdk11
+          jre: "openjdk11"
       - aluminium:
-          branch: 'master'
+          branch: "stable/aluminium"
           java-version: openjdk11
-          jre: 'openjdk11'
+          jre: "openjdk11"
           karaf-version: odl
       - magnesium:
-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"
           java-version: openjdk11
-          jre: 'openjdk11'
+          jre: "openjdk11"
           karaf-version: odl
       - sodium:
-          branch: 'stable/sodium'
+          branch: "stable/sodium"
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
-              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
+            mvn:org.opendaylight.transportpce/features-transportpce//xml/features
           sm-features: >
-              odl-transportpce,
-              odl-transportpce-api,
-              odl-transportpce-ordmodels
+            odl-transportpce,
+            odl-transportpce-api,
+            odl-transportpce-ordmodels
 
 - project:
     name: distribution-managed
     jobs:
       # gerrit- is generic template, distribution- is project specific.
-      - 'distribution-merge-{type}-{stream}'
-      - 'distribution-verify-{type}-{stream}'
-      - 'distribution-check-{type}-{stream}'
-      - 'distribution-csit-managed-{stream}'
+      - "distribution-merge-{type}-{stream}"
+      - "distribution-verify-{type}-{stream}"
+      - "distribution-check-{type}-{stream}"
+      - "distribution-csit-managed-{stream}"
 
     project: integration/distribution
     project-name: distribution
     mvn-settings: integration-distribution-settings
-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m'
-    email-upstream: '[int/dist]'
+    mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
+    mvn-opts: "-Xmx1024m"
+    email-upstream: "[int/dist]"
     type: managed
-    profile: '-Pmanaged'
-    forbidden-files: 'opendaylight/**'
+    profile: "-Pmanaged"
+    forbidden-files: "opendaylight/**"
     karaf-version: karaf4
-    dist-pom: 'distribution/pom.xml'
+    dist-pom: "distribution/pom.xml"
 
     stream:
+      - silicon:
+          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: 'master'
-          java-version: 'openjdk11'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          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},
+            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'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"
+          jre: "openjdk11"
           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},
-              serviceutils-maven-merge-{stream},
+            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},
+            serviceutils-maven-merge-{stream},
       - sodium:
-          branch: 'stable/sodium'
+          branch: "stable/sodium"
           dependencies: >
-              aaa-merge-{stream},
-              bgpcep-merge-{stream},
-              coe-merge-{stream},
-              controller-merge-{stream},
-              daexim-merge-{stream},
-              genius-merge-{stream},
-              infrautils-merge-{stream},
-              lispflowmapping-merge-{stream},
-              netconf-merge-{stream},
-              netvirt-merge-{stream}
-              neutron-merge-{stream},
-              openflowplugin-merge-{stream},
-              ovsdb-merge-{stream},
-              serviceutils-merge-{stream},
-              sfc-merge-{stream}
+            aaa-merge-{stream},
+            bgpcep-merge-{stream},
+            coe-merge-{stream},
+            controller-merge-{stream},
+            daexim-merge-{stream},
+            genius-merge-{stream},
+            infrautils-merge-{stream},
+            lispflowmapping-merge-{stream},
+            netconf-merge-{stream},
+            netvirt-merge-{stream}
+            neutron-merge-{stream},
+            openflowplugin-merge-{stream},
+            ovsdb-merge-{stream},
+            serviceutils-merge-{stream},
+            sfc-merge-{stream}
 
 - project:
     name: distribution-full
     jobs:
       # gerrit- is generic template, distribution- is project specific.
-      - 'distribution-merge-{type}-{stream}'
-      - 'distribution-verify-{type}-{stream}'
-      - 'distribution-check-{type}-{stream}'
+      - "distribution-merge-{type}-{stream}"
+      - "distribution-verify-{type}-{stream}"
+      - "distribution-check-{type}-{stream}"
 
     project: integration/distribution
     project-name: distribution
     mvn-settings: integration-distribution-settings
-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m'
-    email-upstream: '[int/dist]'
+    mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
+    mvn-opts: "-Xmx1024m"
+    email-upstream: "[int/dist]"
     type: full
-    profile: '-Punmanaged'
-    files: 'opendaylight/**'
+    profile: "-Punmanaged"
+    files: "opendaylight/**"
     karaf-version: odl
-    dist-pom: 'distribution/opendaylight/pom.xml'
+    dist-pom: "distribution/opendaylight/pom.xml"
 
     stream:
+      - silicon:
+          branch: "master"
+          java-version: "openjdk11"
+          karaf-version: odl
+          dependencies: >
+            distribution-merge-managed-{stream},
       - aluminium:
-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"
           karaf-version: odl
           dependencies: >
-              distribution-merge-managed-{stream},
+            distribution-merge-managed-{stream},
       - magnesium:
-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"
           karaf-version: odl
           dependencies: >
-              distribution-merge-managed-{stream},
+            distribution-merge-managed-{stream},
       - sodium:
-          branch: 'stable/sodium'
+          branch: "stable/sodium"
           karaf-version: odl
           dependencies: >
-              distribution-merge-managed-{stream},
-              transportpce-merge-{stream}
+            distribution-merge-managed-{stream},
+            transportpce-merge-{stream}
 
 - project:
     name: distribution-release
@@ -166,25 +193,28 @@
           sign-artifacts: true
       - gerrit-release-merge
 
-    project: 'integration/distribution'
-    project-name: 'distribution'
-    mvn-goals: 'clean deploy -f opendaylight/pom.xml'
-    mvn-settings: 'integration-distribution-settings'
-    mvn-opts: '-Xmx1024m'
-    email-upstream: '[int/dist]'
+    project: "integration/distribution"
+    project-name: "distribution"
+    mvn-goals: "clean deploy -f opendaylight/pom.xml"
+    mvn-settings: "integration-distribution-settings"
+    mvn-opts: "-Xmx1024m"
+    email-upstream: "[int/dist]"
 
     # Used by the release job
     staging-profile-id: 2af042ed81d5e2
 
     stream:
+      - silicon:
+          branch: "master"
+          java-version: "openjdk11"
       - aluminium:
-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"
       - magnesium:
-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"
       - sodium:
-          branch: 'stable/sodium'
+          branch: "stable/sodium"
 
 - project:
     name: distribution-sonar
@@ -194,18 +224,18 @@
     project: integration/distribution
     project-name: distribution
     branch: master
-    java-version: 'openjdk11'
+    java-version: "openjdk11"
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
-    mvn-opts: '-Xmx1024m'
+    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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: distribution-view
     views:
       - common-view
     view-name: distribution
-    view-regex: '^(integration-)?distribution-.*'
+    view-regex: "^(integration-)?distribution-.*"