X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-projects.yaml;h=9296e3bbddaace51b2ed8bf2cbaefc6cb9bbcdb4;hb=1ea481d31e85ab7079d8ac187d6d0bc6ffc7ced8;hp=671fd7d3eeb7f71368dc5e01207deffb629249b4;hpb=a755f99e013c1422ebfe032a319f355c91552c76;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 671fd7d3e..9296e3bbd 100644
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -3,25 +3,29 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-release-{stream}'
+      - autorelease-generate-release-notes-{stream}
+      - autorelease-version-bump-{stream}
 
     stream:
+      - nitrogen:
+          next-release-tag: Nitrogen
+          branch: 'master'
+          jdk: 'openjdk8'
+          integration-test: nitrogen
+          karaf-version: karaf3
       - 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
-      - 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
+          karaf-version: karaf3
 
     project: 'releng/autorelease'
     archive-artifacts: >
@@ -29,6 +33,7 @@
         **/*.log
         patches/**
         patches.tar.gz
+        error.log.gz
 
 ###
 # TODO: Remove this job once guava21 testing is complete
@@ -69,6 +74,8 @@
           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:
@@ -205,7 +212,6 @@
           settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'
       - autorelease-maven-sources-post-process
-      - autorelease-sys-stats
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_
@@ -219,5 +225,4 @@
             condition: UNSTABLE_OR_BETTER
             property-file: variables.jenkins-trigger
             fail-on-missing: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish