CI fails when a PR is raised for a preparation release due to version mismatch.

Correction in test/upgrade/Makefile base_version = {version} to base_version = {version}+1
Also, add a step to update the cloudbuild.yaml by incrementing the _BASE_VERSION.