From 43da45b8b532ea1978f5a36f6acb93756f5ad61a Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 14 Aug 2017 20:44:03 -0400 Subject: [PATCH] Handle yangtools nitrogen non-standard branch Change-Id: I0e96ed0298ffb18afb7d5077a6714cc0b1800796 Signed-off-by: Thanh Ha --- jjb/autorelease/version-bump.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh index 2c09204f7..cb1bd87b3 100644 --- a/jjb/autorelease/version-bump.sh +++ b/jjb/autorelease/version-bump.sh @@ -48,7 +48,12 @@ mkdir -p "$patch_dir" for module in $(git submodule | awk '{ print $2 }') do pushd "$module" - git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch" + # TODO: Remove once stable/nitrogen is no longer supported. + if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then + git format-patch --stdout "origin/v1.2.x" > "$patch_dir/${module//\//-}.patch" + else + git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch" + fi git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD" popd done -- 2.36.6