Revert "Exclude release notes job for ar beryllium"

This reverts commit 0c71a6b23a29c2bebc2759a1a0c334ff0665bc9a.

Change-Id: I3eb6b9eded9f00dc9b8c5c3e035e9ca37a4b69be
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 0d85280568111b5ab66e67646f11f18d5133230b..7b6b0e2046808b4d59cc9ad561530ef71a782453 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -133,11 +133,15 @@
     name: autorelease-generate-release-notes
     builders:
       - shell: |
-          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"
+          # 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
           fi
 
 - publisher:

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 324b3be42ae223cc17ea7633343392175df99be9..e61a0fe5a99bb9afebc6dfc42206dafde54690bf 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -5,9 +5,6 @@
       - 'autorelease-release-{stream}'
       - 'autorelease-generate-release-notes-{stream}'
 
-    exclude:
-      - jobs: autorelease-generate-release-notes-beryllium
-
     stream:
       - nitrogen:
           next-release-tag: Nitrogen