From: Anil Belur <abelur@linuxfoundation.org>
Date: Tue, 16 May 2017 01:48:07 +0000 (+1000)
Subject: Add new project section for release notes
X-Git-Tag: release/carbon~41^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=3473052865402b842ead38173b1369f08b66b05d

Add new project section for release notes

Having a separate project section allows us to exclude
any streams we dont want the release notes job to build.

Change-Id: Ibbeaaacda33bb7657481a7212ca1e2998c296074
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 7b6b0e204..0d8528056 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -133,15 +133,11 @@
     name: autorelease-generate-release-notes
     builders:
       - shell: |
-          # TODO: Remove this condition once stable/beryllium is no longer
-          #       officially maintained.
-          if [ "$GERRIT_BRANCH" != "stable/beryllium" ]; then
-              cd $WORKSPACE/scripts/release_notes_management
-              java -jar target/autonotes.jar
-              if [ -f  "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" ]; then
-                  mkdir -p $WORKSPACE/archives
-                  cp -vf "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" "$WORKSPACE/archives"
-              fi
+          cd $WORKSPACE/scripts/release_notes_management
+          java -jar target/autonotes.jar
+          if [ -f  "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" ]; then
+              mkdir -p $WORKSPACE/archives
+              cp -vf "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" "$WORKSPACE/archives"
           fi
 
 - publisher:
diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index e61a0fe5a..6e5fa31f4 100644
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -3,7 +3,6 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-release-{stream}'
-      - 'autorelease-generate-release-notes-{stream}'
 
     stream:
       - nitrogen:
@@ -41,6 +40,28 @@
         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
 ###