Update release branch cut to still update container and snapshot vers…

…ions to 2.XX.0 (#33872)

* Update release branch cut to still update container version to 2.XX.0

* Update a few more spots

.github/workflows/cut_release_branch.yml

@@ -74,7 +74,7 @@ jobs:
           echo "==============================================================="
       - name: Update release version for dataflow runner
         run: |
-          sed -i -e "s/'beam-master-.*'/'${RELEASE}'/g" \
+          sed -i -e "s/'beam-master-.*'/'${RELEASE}.0'/g" \
           runners/google-cloud-dataflow-java/build.gradle
           echo "===============Update release branch as following=============="
           git diff

release/src/main/scripts/set_version.sh

@@ -69,6 +69,11 @@ if [[ -z $TARGET_VERSION ]] ; then
   exit 1
 fi
 
+if ! [[ ${RELEASE} =~ ([0-9]+\.[0-9]+\.[0-9]+) ]];
+  then  echo "The input for RELEASE does not match a valid format [0-9]+\.[0-9]+\.[0-9]+"
+  exit 1
+fi
+
 if [[ -z "$IS_SNAPSHOT_VERSION" ]] ; then
   # Fixing a release version
   sed -i -e "s/version=.*/version=$TARGET_VERSION/" gradle.properties

release/src/main/scripts/verify_release_build.sh

@@ -36,7 +36,7 @@
 set -e
 
 BEAM_REPO_URL=https://github.com/apache/beam.git
-RELEASE_BRANCH=release-${RELEASE_VER}
+RELEASE_BRANCH="release-$(cut -d '.' -f 1,2 <<< $RELEASE)"
 WORKING_BRANCH=postcommit_validation_pr
 SCRIPT=$(readlink -f $0)
 SCRIPT_DIR=$(dirname $SCRIPT)