Merge pull request apache#3626 from rhoughton-pivot/develop

Geode follows a Gitflow working model. Follow it.

ci/pipelines/geode-build/jinja.template.yml

@@ -171,7 +171,7 @@ resources:
 - name: geode-benchmarks
   type: git
   source:
-    branch: develop
+    branch: {{benchmarks.branch}}
     depth: 1
     uri: https://github.com/apache/geode-benchmarks.git
 - name: geode-build-version
@@ -395,6 +395,7 @@ jobs:
         AWS_DEFAULT_REGION: us-west-2
         AWS_REGION: us-west-2
         ARTIFACT_BUCKET: ((artifact-bucket))
+        BENCHMARKS_BRANCH: {{benchmarks.branch}}
         BASELINE_BRANCH: {{benchmarks.baseline_branch}}
         BASELINE_VERSION: {{benchmarks.baseline_version}}
       run:

ci/pipelines/shared/jinja.variables.yml

@@ -58,6 +58,7 @@ java_test_versions:
 
 benchmarks:
   # set one or the other but not both
+  branch: "develop"
   baseline_branch: ""
   baseline_version: "1.9.0"
 

ci/scripts/run_benchmarks.sh

@@ -34,7 +34,7 @@ CLUSTER_TAG="${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}-${BUILD_ID}"
 RESULTS_DIR=$(pwd)/results/benchmarks-${CLUSTER_TAG}
 
 CLUSTER_COUNT=4
-BENCHMARKS_BRANCH=develop
+BENCHMARKS_BRANCH=${BENCHMARKS_BRANCH:-develop}
 
 pushd geode
 GEODE_SHA=$(git rev-parse --verify HEAD)

docker/Dockerfile

@@ -25,17 +25,17 @@ RUN apk add --no-cache \
 #       8763 31B4 5A97 E382 D1BD  FB44 4482 0F9C ABF4 396F
 # uid       [  undef ] Mike Stolz <[email protected]>
 # sub   4096R/3871E6AD 2018-04-12 [expires: 2022-04-12]
-ENV GEODE_GPG 876331B45A97E382D1BDFB4444820F9CABF4396F
+ENV GEODE_GPG DB5476815A475574577D442B468A4800EAFB2498
 # TODO does this change per-release like other Apache projects? (and thus needs to be a list of full fingerprints from a KEYS file instead?)
 
 ENV GEODE_HOME /geode
 ENV PATH $PATH:$GEODE_HOME/bin
 
 # https://geode.apache.org/releases/
-ENV GEODE_VERSION 1.6.0
+ENV GEODE_VERSION 1.9.0
 # Binaries TGZ SHA-256
 # https://dist.apache.org/repos/dist/release/geode/VERSION/apache-geode-VERSION.tgz.sha256
-ENV GEODE_SHA256 79e8d81d058b1c4edd5fb414ff30ac530f7913b978f5abc899c353fcb06e5ef3
+ENV GEODE_SHA256 8794808ebc89bc855f0b989b32e91e890d446cfd058e123f6ccb9e12597c1c4f
 
 # http://apache.org/dyn/closer.cgi/geode/1.3.0/apache-geode-1.3.0.tgz
 

geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/GradleBuildWithGeodeCoreAcceptanceTest.java

@@ -12,6 +12,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
+
 package org.apache.geode.management.internal.rest;
 
 import static org.apache.geode.test.util.ResourceUtils.copyDirectoryResource;