Merge "Replace `` cmd substitution with $()"

[releng/builder.git] / jjb / autorelease / autorelease-projects.yaml

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 36e385a6c0621a7265eea6bcff7d87116a92c43a..fee1e77dfc093c86081ef7c10dbc7c4637041d67 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -5,13 +5,18 @@
       - 'autorelease-release-{stream}'
 
     stream:
+      - nitrogen:
+          next-release-tag: Nitrogen
+          branch: 'master'
+          jdk: 'openjdk8'
+          integration-test: nitrogen
       - carbon:
           next-release-tag: Carbon
-          branch: 'master'
+          branch: 'stable/carbon'
           jdk: 'openjdk8'
           integration-test: carbon
       - boron:
-          next-release-tag: Boron-SR3
+          next-release-tag: Boron-SR4
           branch: 'stable/boron'
           jdk: 'openjdk8'
           integration-test: boron
@@ -27,8 +32,7 @@
     archive-artifacts: >
         **/*.prop
         **/*.log
-        **/patches/*.bundle
-        **/patches/*.patch
+        patches/**
         patches.tar.gz
 
 ###
@@ -65,6 +69,7 @@
       - maven-exec:
           maven-version: 'mvn33'
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -200,6 +205,7 @@
       - autorelease-maven-deploy
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
+          opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
           maven-version: 'mvn33'
           settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'