This is an automated email from the ASF dual-hosted git repository.
sai_boorlagadda pushed a commit to branch feature/GEODE-5212
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-5212 by this
push:
new 23481d2 git base doesnt seem to see PATH, so use full name
23481d2 is described below
commit 23481d22a6f5775e2d3c7780453f5f33238391f4
Author: Sai Boorlagadda <[email protected]>
AuthorDate: Wed Jul 11 13:34:08 2018 -0700
git base doesnt seem to see PATH, so use full name
---
ci/scripts/test-archive.sh | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/ci/scripts/test-archive.sh b/ci/scripts/test-archive.sh
index ff0ef39..076f0fa 100755
--- a/ci/scripts/test-archive.sh
+++ b/ci/scripts/test-archive.sh
@@ -33,10 +33,13 @@ if [ -e "${GEODE_PULL_REQUEST_ID_FILE}" ]; then
GEODE_PULL_REQUEST_ID=$(cat ${GEODE_PULL_REQUEST_ID_FILE})
fi
+GCLOUD=gcloud
+GSUTIL=gsutil
UNAME_O=$(uname -o)
# Check for Windows (MINGW64) environment
if [ ${UNAME_O} = "Msys" ]; then
- export PATH="${PATH}:/c/Program Files (x86)/Google/Cloud
SDK/google-cloud-sdk/platform/bundledpython:/c/Program Files (x86)/Google/Cloud
SDK/google-cloud-sdk/platform/gsutil"
+ GCLOUD=gcloud.cmd
+ GSUTIL=gsutil.cmd
fi
env | sort
@@ -90,10 +93,10 @@ echo "GRADLE_TASK = ${GRADLE_TASK}"
echo "BASE_FILENAME = ${BASE_FILENAME}"
set +e
-gcloud info
-gcloud config set account ${SERVICE_ACCOUNT}
+$GCLOUD info
+$GCLOUD config set account ${SERVICE_ACCOUNT}
-gsutil ls gs://files.apachegeode-ci.info/
+$GSUTIL ls gs://files.apachegeode-ci.info/
set -e
export FILENAME=${BASE_FILENAME}-${FULL_PRODUCT_VERSION}.tgz
@@ -125,7 +128,7 @@ if [ ! -d "${GEODE_BUILD}/build/reports/combined" ]; then
fi
pushd ${GEODE_BUILD}/build/reports/combined
-gsutil -q -m cp -r * gs://${TEST_RESULTS_DESTINATION}
+$GSUTIL -q -m cp -r * gs://${TEST_RESULTS_DESTINATION}
popd
echo ""
@@ -134,7 +137,7 @@ printf "\033[92mhttp://${TEST_RESULTS_DESTINATION}\033[0m\n"
printf
"\033[92m=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\033[0m\n"
printf "\n"
-gsutil cp ${DEST_DIR}/${FILENAME} gs://${TEST_ARTIFACTS_DESTINATION}
+$GSUTIL cp ${DEST_DIR}/${FILENAME} gs://${TEST_ARTIFACTS_DESTINATION}
printf "\033[92mTest artifacts from this job are available at:\033[0m\n"
printf "\n"