added workspace/crate updates for patch releases (#45)

Co-authored-by: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>

Author: adwk67

release/README.adoc

@@ -213,14 +213,15 @@ To create release tags for bugfix/patch releases use the `create-bugfix-tag.sh`
 - `-p`: push flag (optional, default is "false"). If provided, the created commits and tags made as part of this process will be pushed to the origin.
 - `-c`: cleanup flag (optional, default is "false"). If provided, the repository folders will be torn down on completion.
 - `-w`: where to create the tag and update versions in code. It can be "products", "operators", "both".
+- `-i`: product image versioning flag (optional, default is "false"). If provided, updates test definitions with product image versions from this release version (i.e. assumes products have been released/tagged, too).
 
 N.B. the flags cannot be combined (e.g. `-p -c` but not `-pc)
 
 e.g.
 
 [source]
 ----
-./release/create-bugfix-tag.sh -t 23.1.0 -p -c -w both
+./release/create-bugfix-tag.sh -t 23.1.0 -p -c -w both -i
 ----
 
 #### What this script does
@@ -239,5 +240,7 @@ e.g.
 ** clones the operator repositories
 ** checks that the release branch exists and the tag doesn't
 ** switches to the release branch
+** updates crate versions and the workspace
+** updates test definitions to use product image versions that match the release tag (if requested with "-i")
 ** tags the branch and pushes it if the push argument is provided
 ** deletes the temporary folder (if requested with "-c")

release/create-bugfix-tag.sh

@@ -28,7 +28,20 @@ tag_operators() {
     if [ -f .gitmodules ]; then
       git submodule update --recursive --init
     fi
-    
+
+    # set tag version where relevant
+    CARGO_VERSION="$INITIAL_DIR"/release/cargo-version.py
+    $CARGO_VERSION --set "$RELEASE_TAG"
+    cargo update --workspace
+    make regenerate-charts
+
+    update_code "${operator}"
+    #-----------------------------------------------------------
+    # ensure .j2 changes are resolved
+    #-----------------------------------------------------------
+    "$TEMP_RELEASE_FOLDER/${operator}"/scripts/docs_templating.sh
+
+    git commit -am "release $RELEASE_TAG"    
     git tag "$RELEASE_TAG"
     push_branch
   done < <(yq '... comments="" | .operators[] ' "$INITIAL_DIR"/release/config.yaml)
@@ -109,6 +122,19 @@ checks() {
 }
 
 
+update_code() {
+  if $PRODUCT_IMAGE_TAGS; then
+    echo "Updating relase tag in code..."
+    if [ -f "$TEMP_RELEASE_FOLDER/$1/tests/test-definition.yaml" ]; then
+      # e.g. 2.2.4-stackable0.5.0 -> 2.2.4-stackable23.1
+      sed -i "s/-stackable.*/-stackable${RELEASE_TAG}/" "$TEMP_RELEASE_FOLDER/$1/tests/test-definition.yaml"
+    fi
+  else
+    echo "Skip updating relase tag in code..."
+  fi
+}
+
+
 push_branch() {
   if $PUSH; then
     echo "Pushing changes..."
@@ -117,6 +143,8 @@ push_branch() {
     git switch main
   else
     echo "(Dry-run: not pushing...)"
+    git push --dry-run "${REPOSITORY}" "${RELEASE_BRANCH}"
+    git push --dry-run "${REPOSITORY}" "${RELEASE_TAG}"
   fi
 }
 
@@ -132,13 +160,15 @@ parse_inputs() {
   PUSH=false
   CLEANUP=false
   WHAT=""
+  PRODUCT_IMAGE_TAGS=false
 
   while [[ "$#" -gt 0 ]]; do
       case $1 in
           -t|--tag) RELEASE_TAG="$2"; shift ;;
           -w|--what) WHAT="$2"; shift ;;
           -p|--push) PUSH=true ;;
           -c|--cleanup) CLEANUP=true ;;
+          -i|--images) PRODUCT_IMAGE_TAGS=true ;;
           *) echo "Unknown parameter passed: $1"; exit 1 ;;
       esac
       shift
@@ -167,7 +197,7 @@ main() {
   # check if tag argument provided
   #-----------------------------------------------------------
   if [ -z "${RELEASE_TAG}" ]; then
-    echo "Usage: create-release-tag.sh -t <tag>"
+    echo "Usage: create-bugfix-tag.sh -t <tag>"
     exit 1
   fi
   #-----------------------------------------------------------