From 10bfa8a11e876e54c39d430de87827552a37f0fb Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 30 Jun 2017 12:09:53 +0300
Subject: [PATCH] ci(aio): avoid printing too large PWA report (and restore
 `print-logs.sh`)

There have been some issues lately with Travis jobs failing due to
`print-log.sh`. This is likely due to trying to print the Lighthouse PWA report,
which is too large.
This commit stops printing that report (since it was rarely used and is pretty
easy to acquire when needed) and restores the `print-logs.sh` script (that was
temporarily removed with dfcca66fd).
---
 .travis.yml                       | 3 +--
 aio/scripts/deploy-preview.sh     | 2 +-
 aio/scripts/deploy-to-firebase.sh | 2 +-
 scripts/ci/env.sh                 | 3 ---
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dce4d9e271..49dbef9662 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,5 +76,4 @@ script:
   - ./scripts/ci/angular.sh
   # all the scripts under this line will not quickly abort in case ${TRAVIS_TEST_RESULT} is 1 (job failure)
   - ./scripts/ci/cleanup.sh
-  # Disabled so we can debug Travis build failures on Master seeming to coming from printing logs
-  # - ./scripts/ci/print-logs.sh
+  - ./scripts/ci/print-logs.sh
diff --git a/aio/scripts/deploy-preview.sh b/aio/scripts/deploy-preview.sh
index 2aa6ebc5b3..4afd49a5cf 100755
--- a/aio/scripts/deploy-preview.sh
+++ b/aio/scripts/deploy-preview.sh
@@ -51,6 +51,6 @@ readonly relevantChangedFilesCount=$(git diff --name-only $TRAVIS_COMMIT_RANGE |
   # Run PWA-score tests (unless the deployment is not public yet;
   # i.e. it could not be automatically verified).
   if [ $httpCode -ne 202 ]; then
-    yarn test-pwa-score -- "$DEPLOYED_URL" "$MIN_PWA_SCORE" "$PWA_RESULTS_LOG"
+    yarn test-pwa-score -- "$DEPLOYED_URL" "$MIN_PWA_SCORE"
   fi
 )
diff --git a/aio/scripts/deploy-to-firebase.sh b/aio/scripts/deploy-to-firebase.sh
index 82b2b25ebc..24279d6648 100755
--- a/aio/scripts/deploy-to-firebase.sh
+++ b/aio/scripts/deploy-to-firebase.sh
@@ -39,5 +39,5 @@ esac
   firebase deploy --message "Commit: $TRAVIS_COMMIT" --non-interactive --token "$firebaseToken"
 
   # Run PWA-score tests
-  yarn test-pwa-score -- "$deployedUrl" "$MIN_PWA_SCORE" "$PWA_RESULTS_LOG"
+  yarn test-pwa-score -- "$deployedUrl" "$MIN_PWA_SCORE"
 )
diff --git a/scripts/ci/env.sh b/scripts/ci/env.sh
index e58b16aef1..9bcc2a6f6d 100755
--- a/scripts/ci/env.sh
+++ b/scripts/ci/env.sh
@@ -124,9 +124,6 @@ setEnvVar PATH $HOME/.yarn/bin:$PATH
 setEnvVar NODE_PATH ${NODE_PATH:-}:${PROJECT_ROOT}/dist/all:${PROJECT_ROOT}/dist/tools
 setEnvVar LOGS_DIR /tmp/angular-build/logs
 
-# Log file for full PWA testing results
-setEnvVar PWA_RESULTS_LOG $LOGS_DIR/pwa-results.json
-
 # strip leading "/home/travis/build/angular/angular/" or "./" path. Could this be done in one shot?
 CURRENT_SHELL_SOURCE_FILE=${BASH_SOURCE#${PROJECT_ROOT}/}
 export CURRENT_SHELL_SOURCE_FILE=${CURRENT_SHELL_SOURCE_FILE#./}