Merge pull request pytorch#192 from pjh5/upload_logs_fix

Fixing credentials to upload_logs

Author: pjh5

cron/build_cron.sh

@@ -158,21 +158,21 @@ if [[ "$NIGHTLIES_DATE" == "$(date +%Y_%m_%d)" ]]; then
     echo "Uploading all of these succesful jobs\n: $succeeded_jobs"
     "${NIGHTLIES_BUILDER_ROOT}/cron/upload.sh" ${succeeded_jobs[@]} > "${log_root}/upload.log" 2>&1
     ret="$?"
-    if [[ "$first_ret" == 0 ]]; then
+    if [[ "$ret" != 0 && "$first_ret" == 0 ]]; then
         echo "FAILED upload.sh"
         first_ret="$ret"
     fi
 
     # Upload the logs
-    "${NIGHTLIES_BUILDER_ROOT}/cron/upload_logs.sh"
+    "${NIGHTLIES_BUILDER_ROOT}/cron/upload_logs.sh" > "${log_root}/upload_logs.log" 2>&1
     ret="$?"
-    if [[ "$first_ret" == 0 ]]; then
+    if [[ "$ret" != 0 && "$first_ret" == 0 ]]; then
         echo "FAILED upload_logs.sh"
         first_ret="$ret"
     fi
-    "${NIGHTLIES_BUILDER_ROOT}/cron/update_hud.sh"
+    "${NIGHTLIES_BUILDER_ROOT}/cron/update_hud.sh" > "${log_root}/update_hud.log" 2>&1
     ret="$?"
-    if [[ "$first_ret" == 0 ]]; then
+    if [[ "$ret" != 0 && "$first_ret" == 0 ]]; then
         echo "FAILED update_hud.sh"
         first_ret="$ret"
     fi
@@ -182,7 +182,7 @@ fi
 # out of memory
 "${NIGHTLIES_BUILDER_ROOT}/cron/clean.sh" > "${log_root}/clean.sh" 2>&1
 ret="$?"
-if [[ "$first_ret" == 0 ]]; then
+if [[ "$ret" != 0 && "$first_ret" == 0 ]]; then
     echo "FAILED clean.sh"
     first_ret="$ret"
 fi

cron/nightly_defaults.sh

@@ -24,6 +24,11 @@ if [[ -z "$PYTORCH_CREDENTIALS_FILE" ]]; then
     fi
 fi
 
+# Location of the temporary miniconda that is downloaded to install conda-build
+# and aws to upload finished packages TODO this is messy to install this in
+# upload.sh and later use it in upload_logs.sh
+CONDA_UPLOADER_INSTALLATION="${today}/miniconda"
+
 # NIGHTLIES_FOLDER
 # N.B. this is also defined in cron_start.sh
 #   An arbitrary root folder to store all nightlies folders, each of which is a

cron/upload.sh

@@ -52,17 +52,16 @@ anaconda upload -h >/dev/null
 ret2="$?"
 set -e
 if [[ "$ret" -ne 0 || "$ret1" -ne 0 || "$ret2" -ne 0 ]]; then
-    tmp_conda="${today}/miniconda"
     miniconda_sh="${today}/miniconda.sh"
     if [[ "$(uname)" == 'Darwin' ]]; then
         curl https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o "$miniconda_sh"
     else
         curl https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o "$miniconda_sh"
     fi
     chmod +x "$miniconda_sh" && \
-        "$miniconda_sh" -b -p "$tmp_conda" && \
+        "$miniconda_sh" -b -p "$CONDA_UPLOADER_INSTALLATION" && \
         rm "$miniconda_sh"
-    export PATH="$tmp_conda/bin:$PATH"
+    export PATH="$CONDA_UPLOADER_INSTALLATION/bin:$PATH"
 
     # Install aws and anaconda client
     pip install awscli

cron/upload_logs.sh

@@ -5,6 +5,12 @@ echo "upload_logs.sh at $(pwd) starting at $(date) on $(uname -a) with pid $$"
 SOURCE_DIR=$(cd $(dirname $0) && pwd)
 source "${SOURCE_DIR}/nightly_defaults.sh"
 
+# Source the credentials if given
+if [[ -x "$PYTORCH_CREDENTIALS_FILE" ]]; then
+    source "$PYTORCH_CREDENTIALS_FILE"
+fi
+export PATH="$CONDA_UPLOADER_INSTALLATION/bin:$PATH"
+
 # Uploads all of the logs
 # N.B. do NOT include the master logs, as there may be secrets in those