Handle yangtools nitrogen on non-standard branch

[releng/builder.git] / jjb / autorelease / version-bump.sh

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index cb1bd87b391d7e7e15acff40cf5320c728ff5508..a44337e0e42713ae66411f7f559a4a5f49f0d27e 100644 (file)
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -25,7 +25,18 @@ BRANCH="$GERRIT_BRANCH"
 set -eu -o pipefail
 
 git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
-git submodule foreach git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
+
+# TODO: Simplify once stable/nitrogen is no longer supported.
+for module in $(git submodule | awk '{ print $2 }')
+do
+    pushd "$module"
+    if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
+        git checkout -b "v1.2.x" "origin/v1.2.x"
+    else
+        git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
+    fi
+    popd
+done
 
 # Setup Gerrit remove to ensure Change-Id gets set on commit.
 git config --global --add gitreview.username "jenkins-releng"
@@ -51,10 +62,11 @@ do
     # 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"
+        git bundle create "$patch_dir/${module//\//-}.bundle" "origin/v1.2.x..HEAD"
     else
         git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch"
+        git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
     fi
-    git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
     popd
 done