From 3a1824f50fc4ca8d9fcc187db17a270b66980804 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 15 May 2017 22:42:57 +0000 Subject: [PATCH] Revert "Exclude release notes job for ar beryllium" This reverts commit 0c71a6b23a29c2bebc2759a1a0c334ff0665bc9a. Change-Id: I3eb6b9eded9f00dc9b8c5c3e035e9ca37a4b69be Signed-off-by: Thanh Ha --- jjb/autorelease/autorelease-macros.yaml | 14 +++++++++----- jjb/autorelease/autorelease-projects.yaml | 3 --- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 0d8528056..7b6b0e204 100644 --- 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 324b3be42..e61a0fe5a 100644 --- 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 -- 2.36.6