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 7b6b0e2046808b4d59cc9ad561530ef71a782453..0d85280568111b5ab66e67646f11f18d5133230b 100644 (file)
--- 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 e61a0fe5a99bb9afebc6dfc42206dafde54690bf..324b3be42ae223cc17ea7633343392175df99be9 100644 (file)
--- 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