Merge "Update Ubuntu 16.04 mininet 28 image"

[releng/builder.git] / jjb / autorelease / prepare-release.sh

diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh
index ca3174cb56044c0237d47977ca1670cfc703e96e..b20b845fefea3cc401e5eca5f911dd26ccc85d99 100644 (file)
--- a/jjb/autorelease/prepare-release.sh
+++ b/jjb/autorelease/prepare-release.sh
@@ -37,29 +37,15 @@ git submodule foreach "echo \$path \$(git rev-parse --verify HEAD) ${RELEASE_TAG
     | tee -a $PATCH_DIR/taglist.log"
 
 echo "$RELEASE_TAG"
-# Remove this case statement when Carbon is no longer supported.
-# Nitrogen onwards we do not want to use the release tag so simply need to
-# strip xml files of -SNAPSHOT tags.
-case "$RELEASE_TAG" in
-    Carbon*)
-        lftools version release "$RELEASE_TAG"
-        ;;
-    *)
-        find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//'
-        ;;
-esac
+find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//'
+
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
 modules=$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml)
 for module in $modules; do
     pushd "$module" || exit
-    # 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/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
-    fi
+    git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
     git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD"
     popd || exit
 done