From 94ad518b096a1005163b417c239dcd401067137a Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 30 Nov 2018 00:47:51 +0100
Subject: [PATCH] build: fix cronjob tests not running against snapshots
 (#14327)

* Due to the fact that the `CIRCLE_WORKFLOW_ID` does not actually return the name of the workflow, but a unique id that is generated dynamically, the cronjob does not run against the Angular github builds.
---
 .circleci/config.yml                        | 20 +++++++++++++++++++-
 scripts/circleci/run-local-browser-tests.sh |  6 ------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c3f64edef65..98114fd3517 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -265,6 +265,21 @@ jobs:
 
       - run: ./scripts/circleci/publish-snapshots.sh
 
+
+  # ----------------------------------------------------------------------------
+  # Job that runs the local browser tests against the Angular Github snapshots
+  # ----------------------------------------------------------------------------
+  snapshot_tests_local_browsers:
+    docker: *docker-firefox-image
+    resource_class: xlarge
+    steps:
+    - *checkout_code
+    - *restore_cache
+    - *yarn_install
+
+    - run: ./scripts/install-angular-snapshots.sh
+    - run: ./scripts/circleci/run-local-browser-tests.sh
+
 # ----------------------------------------------------------------------------------------
 # Workflow definitions. A workflow usually groups multiple jobs together. This is useful if
 # one job depends on another.
@@ -311,7 +326,10 @@ workflows:
   # This workflow runs various jobs against the Angular snapshot builds from Github.
   snapshot_tests:
     jobs:
-      - tests_local_browsers
+      # Note that we need additional jobs for the nightly snapshot tests because there is no
+      # easy way to detect whether a job runs inside of a cronjob or specific workflow.
+      # See: https://circleci.com/ideas/?idea=CCI-I-295
+      - snapshot_tests_local_browsers
     triggers:
       - schedule:
           cron: "0 0 * * *"
diff --git a/scripts/circleci/run-local-browser-tests.sh b/scripts/circleci/run-local-browser-tests.sh
index dafd32deead..906eb432135 100755
--- a/scripts/circleci/run-local-browser-tests.sh
+++ b/scripts/circleci/run-local-browser-tests.sh
@@ -7,12 +7,6 @@ set -e
 # Go to project directory.
 cd $(dirname ${0})/../..
 
-# In case the "snapshot_tests" workflow is currently running this script, we
-# want to run the local browser tests against the Angular snapshot builds.
-if [[ "${CIRCLE_WORKFLOW_ID}" == "snapshot_tests" ]]; then
-  ./scripts/install-angular-snapshots.sh
-fi
-
 # Setup the test platform environment variable that will be read
 # by the Karma configuration script.
 export TEST_PLATFORM="local"