Remove nitrogen branches in autorelease

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

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index 54bd1203f62b0bb01728a9d132ae6498980b5ca3..d48b49070ed71a29109f688d0d8818a442577320 100644 (file)
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -35,15 +35,10 @@ fi
 if [ "$BRANCH_CUT" = "false" ]; then
     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
+        git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
         popd
     done
 fi
@@ -73,14 +68,8 @@ mkdir -p "$patch_dir"
 for module in $(git submodule | awk '{ print $2 }')
 do
     pushd "$module"
-    # 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 format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch"
+    git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
     popd
 done