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 6eddc0dbf3fb22becec736ed014d721bf6b572e1..fee1e77dfc093c86081ef7c10dbc7c4637041d67 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -3,27 +3,37 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-release-{stream}'
-      - 'autorelease-project-report-{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
       - beryllium:
+          # Only run once a week since Beryllium is in maintenance mode
+          cron: 'H H * * 0'
           next-release-tag: Beryllium-SR5
           branch: 'stable/beryllium'
           jdk: 'openjdk7'
           integration-test: beryllium
 
     project: 'releng/autorelease'
-    archive-artifacts: '**/*.prop **/*.log **/patches/*.bundle **/patches/*.patch all-bundles.tar.gz'
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        patches/**
+        patches.tar.gz
 
 ###
 # TODO: Remove this job once guava21 testing is complete
@@ -59,6 +69,7 @@
       - maven-exec:
           maven-version: 'mvn33'
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -194,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'