Exclude release notes job for ar beryllium

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index fb85cf2ab3eb584aecfd0c15184b1579fe4fc3fb..324b3be42ae223cc17ea7633343392175df99be9 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -3,18 +3,30 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-release-{stream}'
+      - 'autorelease-generate-release-notes-{stream}'
+
+    exclude:
+      - jobs: autorelease-generate-release-notes-beryllium
 
     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
+          karaf-version: karaf3
+          extra-mvn-opts: -Dskip.karaf.featureTest=true
       - boron:
-          next-release-tag: Boron-SR3
+          next-release-tag: Boron-SR4
           branch: 'stable/boron'
           jdk: 'openjdk8'
           integration-test: boron
+          karaf-version: karaf3
       - beryllium:
           # Only run once a week since Beryllium is in maintenance mode
           cron: 'H H * * 0'
@@ -22,6 +34,7 @@
           branch: 'stable/beryllium'
           jdk: 'openjdk7'
           integration-test: beryllium
+          karaf-version: karaf3
 
     project: 'releng/autorelease'
     archive-artifacts: >
@@ -29,6 +42,7 @@
         **/*.log
         patches/**
         patches.tar.gz
+        error.log.gz
 
 ###
 # TODO: Remove this job once guava21 testing is complete
@@ -64,10 +78,13 @@
       - maven-exec:
           maven-version: 'mvn33'
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
       - autorelease-release-tag:
           release-tag: '{next-release-tag}'
       - autorelease-release-branch:
@@ -199,11 +216,11 @@
       - 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'
       - autorelease-maven-sources-post-process
-      - autorelease-sys-stats
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_