This is an automated email from the ASF dual-hosted git repository.
sai_boorlagadda pushed a commit to branch feature/GEODE-5212-specific-category
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to
refs/heads/feature/GEODE-5212-specific-category by this push:
new 87b788a pulled in changes required for GSUTIL and JDK
87b788a is described below
commit 87b788a8fab402029e19fe2685fe43552e26ee38
Author: Sai Boorlagadda <[email protected]>
AuthorDate: Mon Jul 23 14:53:57 2018 -0700
pulled in changes required for GSUTIL and JDK
---
ci/scripts/test-archive.sh | 23 +++++++++++++++++++----
ci/scripts/test-run.sh | 6 +++++-
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/ci/scripts/test-archive.sh b/ci/scripts/test-archive.sh
index fcdd718..dbe1de6 100755
--- a/ci/scripts/test-archive.sh
+++ b/ci/scripts/test-archive.sh
@@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-set -e
+set -e -x
export TERM=${TERM:-dumb}
export BUILDROOT=$(pwd)
@@ -33,6 +33,16 @@ 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
+ GCLOUD=gcloud.cmd
+ GSUTIL=gsutil.cmd
+fi
+
+env | sort
GEODE_BUILD_VERSION_FILE=${BUILDROOT}/geode-build-version/number
@@ -82,7 +92,12 @@ echo "TMPDIR = ${TMPDIR}"
echo "GRADLE_TASK = ${GRADLE_TASK}"
echo "BASE_FILENAME = ${BASE_FILENAME}"
-gcloud config set account ${SERVICE_ACCOUNT}
+set +e
+$GCLOUD info
+$GCLOUD config set account ${SERVICE_ACCOUNT}
+
+$GSUTIL ls gs://files.apachegeode-ci.info/
+set -e
export FILENAME=${BASE_FILENAME}-${FULL_PRODUCT_VERSION}.tgz
@@ -114,7 +129,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 ""
@@ -123,7 +138,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"
diff --git a/ci/scripts/test-run.sh b/ci/scripts/test-run.sh
index 7788b16..8c3239f 100755
--- a/ci/scripts/test-run.sh
+++ b/ci/scripts/test-run.sh
@@ -77,7 +77,11 @@ else
fi
printf "\nUsing the following JDK:"
-java -version
+if [ -n "${JAVA_HOME}" ]; then
+ ${JAVA_HOME}/bin/java -version
+else
+ java -version
+fi
printf "\n\n"
directories_file=${DEST_DIR}/artifact_directories
