Minor improvements to release notes job

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 09f9723ee117a560dfe4a89b3df21af6852b1d4a..9296e3bbddaace51b2ed8bf2cbaefc6cb9bbcdb4 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -3,7 +3,8 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-release-{stream}'
-      - 'autorelease-generate-release-notes-{stream}'
+      - autorelease-generate-release-notes-{stream}
+      - autorelease-version-bump-{stream}
 
     stream:
       - nitrogen:
@@ -11,26 +12,20 @@
           branch: 'master'
           jdk: 'openjdk8'
           integration-test: nitrogen
+          karaf-version: karaf3
       - carbon:
           next-release-tag: Carbon
           branch: 'stable/carbon'
           jdk: 'openjdk8'
           integration-test: carbon
           karaf-version: karaf3
+          extra-mvn-opts: -Dskip.karaf.featureTest=true
       - boron:
           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'
-          next-release-tag: Beryllium-SR5
-          branch: 'stable/beryllium'
-          jdk: 'openjdk7'
-          integration-test: beryllium
-          karaf-version: karaf3
 
     project: 'releng/autorelease'
     archive-artifacts: >
@@ -38,6 +33,7 @@
         **/*.log
         patches/**
         patches.tar.gz
+        error.log.gz
 
 ###
 # TODO: Remove this job once guava21 testing is complete
@@ -229,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