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 6e5fa31f47dea54dc76d7a29b29a33173813d7e2..9296e3bbddaace51b2ed8bf2cbaefc6cb9bbcdb4 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -3,6 +3,8 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-release-{stream}'
+      - autorelease-generate-release-notes-{stream}
+      - autorelease-version-bump-{stream}
 
     stream:
       - nitrogen:
@@ -10,6 +12,7 @@
           branch: 'master'
           jdk: 'openjdk8'
           integration-test: nitrogen
+          karaf-version: karaf3
       - carbon:
           next-release-tag: Carbon
           branch: 'stable/carbon'
@@ -23,14 +26,6 @@
           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: >
@@ -40,28 +35,6 @@
         patches.tar.gz
         error.log.gz
 
-
-- project:
-    name: autorelease-release-notes
-    jobs:
-      - 'autorelease-generate-release-notes-{stream}'
-
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jdk: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
-
-    project: 'releng/autorelease'
-    archive-artifacts: >
-        **/*.log
-
-
 ###
 # TODO: Remove this job once guava21 testing is complete
 ###
@@ -252,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