Drop RELEASE_TAG from Nitrogen onwards

[releng/builder.git] / jjb / autorelease / include-raw-autorelease-release-versions.sh

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index bb50bec4170fb9fc897d975209ea113c60d01617..dbf2e287f5730e151ced66e0b09098e5f6ca45ea 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -21,7 +21,17 @@ RELEASE_TAG="${RELEASE_TAG^}"
 PATCH_DIR="$WORKSPACE/patches"
 
 echo "$RELEASE_TAG"
-lftools version release "$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
+    Boron*|Carbon*)
+        lftools version release "$RELEASE_TAG"
+        ;;
+    *)
+        find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//'
+        ;;
+esac
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"