From: Anil Belur <abelur@linuxfoundation.org>
Date: Thu, 11 May 2017 06:41:44 +0000 (+1000)
Subject: Exclude release notes job for ar beryllium
X-Git-Tag: release/carbon~46^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=0c71a6b23a29c2bebc2759a1a0c334ff0665bc9a

Exclude release notes job for ar beryllium

This is a better way for excluding the job then using
condition in the builder.

Change-Id: Ibcb1dcf8cd02abe8eca8c2c88765dea7f6f22c2c
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..324b3be42 100644
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -5,6 +5,9 @@
       - 'autorelease-release-{stream}'
       - 'autorelease-generate-release-notes-{stream}'
 
+    exclude:
+      - jobs: autorelease-generate-release-notes-beryllium
+
     stream:
       - nitrogen:
           next-release-tag: Nitrogen