patch version automatically in the release script

Author: fabianvf

UPSTREAM-MERGE.sh

@@ -119,6 +119,11 @@ git add README-sdk.md
 echo "$version" > UPSTREAM-VERSION
 git add UPSTREAM-VERSION
 
+# Edit the version in the patch so that -ocp is properly appended
+sed -i.bak -e "s/+export SIMPLE_VERSION=.*/+export SIMPLE_VERSION = ${version}-ocp/" patches/03-setversion.patch
+rm -f patches/03-setversion.patch.bak
+git add patches/03-setversion.patch
+
 # just to make sure an old version merge is not being made
 git diff --staged --quiet && { echo "No changed files in merge?! Aborting."; exit 1; }
 

patches/03-setversion.patch

@@ -7,7 +7,7 @@ diff -up ./Makefile.setversion ./Makefile
  # Build-time variables to inject into binaries
 -export SIMPLE_VERSION = $(shell (test "$(shell git describe)" = "$(shell git describe --abbrev=0)" && echo $(shell git describe)) || echo $(shell git describe --abbrev=0)+git)
 -export GIT_VERSION = $(shell git describe --dirty --tags --always)
-+export SIMPLE_VERSION = v1.10.1-ocp
++export SIMPLE_VERSION = v1.13.1-ocp
 +export GIT_VERSION = $(SIMPLE_VERSION)
  export GIT_COMMIT = $(shell git rev-parse HEAD)
  export K8S_VERSION = 1.19.4