[geode] branch develop updated: GEODE-7985: benchmark develop against 1.12.0 rather than 1.10.0 (#4957)

[on...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

onichols pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new c8d1048  GEODE-7985: benchmark develop against 1.12.0 rather than 1.10.0 (#4957)
c8d1048 is described below

commit c8d1048a63840919ea3389cf69be717e02a68a03
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Wed Apr 15 18:16:07 2020 -0700

    GEODE-7985: benchmark develop against 1.12.0 rather than 1.10.0 (#4957)
    
    * GEODE-7985: benchmark develop against 1.12.0 rather than 1.10.0
    * update release scripts to keep the baseline on develop in sync when a new minor is released
---
 ci/pipelines/shared/jinja.variables.yml |  2 +-
 dev-tools/release/promote_rc.sh         | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index 1c9f746..c666fc7 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -17,7 +17,7 @@
 
 benchmarks:
   baseline_branch: ''
-  baseline_version: '1.10.0'
+  baseline_version: '1.12.0'
   benchmark_branch: develop
   flavors:
   - title: '_base'
diff --git a/dev-tools/release/promote_rc.sh b/dev-tools/release/promote_rc.sh
index 15195de..f749997 100755
--- a/dev-tools/release/promote_rc.sh
+++ b/dev-tools/release/promote_rc.sh
@@ -177,7 +177,7 @@ else
   git checkout -b apache-geode-${VERSION}
   GEODE_SHA=$(awk '{print $1}' < $WORKSPACE/dist/release/geode/${VERSION}/apache-geode-${VERSION}.tgz.sha256)
   set +x
-  sed -e 's# *url ".*#  url "https://www.apache.org/dyn/closer.cgi?path=geode/'"${VERSION}"'/apache-geode-'"${VERSION}"'.tgz"#' \
+  sed -e 's# *url ".*#  url "https://www.apache.org/dyn/closer.lua?path=geode/'"${VERSION}"'/apache-geode-'"${VERSION}"'.tgz"#' \
       -e '/ *mirror ".*www.*/d' \
       -e '/ *mirror ".*downloads.*/d' \
       -e 's# *mirror ".*archive.*#  mirror "https://archive.apache.org/dist/geode/'"${VERSION}"'/apache-geode-'"${VERSION}"'.tgz"\
@@ -327,7 +327,7 @@ fi
 
 echo ""
 echo "============================================================"
-echo "Updating 'old' versions"
+echo "Updating 'old' versions and Benchmarks baseline"
 echo "============================================================"
 set -x
 cd ${GEODE_DEVELOP}
@@ -358,10 +358,19 @@ else
     -i.bak settings.gradle
 fi
 rm settings.gradle.bak
+if [ $PATCH -eq 0 ] ; then
+  #also update benchmark baseline for develop to this new minor
+  sed -e "s/^  baseline_version:.*/  baseline_version: '${VERSION}'/" \
+    -i.bak ci/pipelines/shared/jinja.variables.yml
+  rm ci/pipelines/shared/jinja.variables.yml.bak
+  BENCHMSG=" and set as Benchmarks baseline"
+  set -x
+  git add ci/pipelines/shared/jinja.variables.yml
+fi
 set -x
 git add settings.gradle
 git diff --staged
-git commit -m "add ${VERSION} to old versions"
+git commit -m "add ${VERSION} to old versions${BENCHMSG} on develop"
 git push -u myfork
 set +x