[geode] branch support/1.12 updated: GEODE-8906: pull in the gradle logs before the rsync (#6021)

[on...@apache.org]

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

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


The following commit(s) were added to refs/heads/support/1.12 by this push:
     new e0c38b9  GEODE-8906: pull in the gradle logs before the rsync (#6021)
e0c38b9 is described below

commit e0c38b97788f9ce7805a40999bdbce218edc1438
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Wed Feb 10 11:54:21 2021 -0800

    GEODE-8906: pull in the gradle logs before the rsync (#6021)
    
    also fixed windows permission errors
    
    (cherry picked from commit bcfb3f956d47d194cd4079c4567ebdce84d16afb)
    (cherry picked from commit 0d9d87e0a8e322725c3c4ee0a9215f9bd63c797d)
---
 ci/scripts/rsync_code_down.sh  | 4 ++--
 ci/scripts/shared_utilities.sh | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ci/scripts/rsync_code_down.sh b/ci/scripts/rsync_code_down.sh
index 75c2c23..bcb93be 100755
--- a/ci/scripts/rsync_code_down.sh
+++ b/ci/scripts/rsync_code_down.sh
@@ -41,12 +41,12 @@ OUTPUT_DIR=${BASE_DIR}/geode-results
 case $ARTIFACT_SLUG in
   windows*)
     JAVA_BUILD_PATH=C:/java8
-    EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH}; cd geode; ./gradlew --no-daemon combineReports'"
+    EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH}; cd geode; cp -r ../.gradle .gradle_logs; ./gradlew --no-daemon combineReports'"
     ;;
   *)
     # JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64
     JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64
-    EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH} && cd geode && ./gradlew --no-daemon combineReports'"
+    EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH} && cd geode && ./gradlew --no-daemon combineReports && mv ../.gradle .gradle_logs'"
     ;;
 esac
 
diff --git a/ci/scripts/shared_utilities.sh b/ci/scripts/shared_utilities.sh
index 03b9233..7ab2822 100644
--- a/ci/scripts/shared_utilities.sh
+++ b/ci/scripts/shared_utilities.sh
@@ -25,7 +25,6 @@ find-here-test-reports() {
   find . -name "*-progress*txt" >> ${output_directories_file}
   find . -name "*.hprof" -o -name "hs_err*.log" -o -name "replay*.log" >> ${output_directories_file}
   find . -type d -name "callstacks" >> ${output_directories_file}
-  mv ${HOME}/.gradle .gradle_logs
   find .gradle_logs -name '*.log' >> ${output_directories_file}
   echo "Collecting the following artifacts..."
   cat ${output_directories_file}