X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=32314b263266c9c44b440000563b138798d7fb53;hb=e1cc5b83666733a7cdc47bb3f42b75cd7a7c8f9e;hp=36dd6ba9bf6374aed929e787b5d19133340397db;hpb=d8f6c46f14f7705f24c3d8393232e5809940b2e9;p=releng%2Fbuilder.git diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 36dd6ba9b..32314b263 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -21,10 +21,14 @@ nexus-iq-stage: release email-upstream: '[int/dist]' stream: - - aluminium: + - silicon: branch: 'master' java-version: openjdk11 jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: openjdk11 + jre: 'openjdk11' karaf-version: odl - magnesium: branch: 'stable/magnesium' @@ -64,7 +68,7 @@ dist-pom: 'distribution/pom.xml' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' jre: 'openjdk11' @@ -81,6 +85,23 @@ openflowplugin-maven-merge-{stream}, ovsdb-maven-merge-{stream}, serviceutils-maven-merge-{stream}, + - aluminium: + 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}, - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' @@ -140,12 +161,18 @@ dist-pom: 'distribution/opendaylight/pom.xml' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' karaf-version: odl dependencies: > distribution-merge-managed-{stream}, + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' + karaf-version: odl + dependencies: > + distribution-merge-managed-{stream}, - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' @@ -177,9 +204,12 @@ staging-profile-id: 2af042ed81d5e2 stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11'