GEODE-5864: Put GLOBAL_GRADLE_ARGS in the right place. (apache#2753)

Authored-by: Sean Goller <[email protected]>
marcoman · Oct 30, 2018 · 1619d91 · 1619d91
1 parent 2324774
commit 1619d91
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
@@ -352,7 +352,6 @@ jobs:
             {{ common_instance_params(publish_artifacts) | indent(12) }}
             GEODE_BRANCH: {{repository.branch}}
             GEODE_FORK: {{repository.fork}}
-            GRADLE_GLOBAL_ARGS: ((gradle-global-args))
           run:
             path: geode-ci/ci/scripts/create_instance.sh
           inputs:
@@ -379,6 +378,7 @@ jobs:
         SERVICE_ACCOUNT: ((!concourse-gcp-account))
         JAVA_BUILD_VERSION: {{ java_build_version.version }}
         MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
+        GRADLE_GLOBAL_ARGS: ((gradle-global-args))
       run:
         path: geode-ci/ci/scripts/execute_publish.sh
       inputs:

diff --git a/ci/scripts/execute_publish.sh b/ci/scripts/execute_publish.sh
@@ -67,6 +67,7 @@ SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-
 
 GRADLE_COMMAND="./gradlew \
     ${DEFAULT_GRADLE_TASK_OPTIONS} \
+    ${GRADLE_GLOBAL_ARGS} \
     -PbuildId=${BUILD_ID} -PmavenSnapshotBucket=${MAVEN_SNAPSHOT_BUCKET} publish"
 
 echo "${GRADLE_COMMAND}"