ci: run ng2/ng4/nightly in circleci like in travis

Author: filipesilva

.circleci/config.yml

@@ -48,7 +48,7 @@ jobs:
           <<: *restore_cache_defaults
       - run: npm run test
 
-# E2E test for current Angular.
+  # E2E test for current Angular.
   e2e-setup:
     <<: *defaults
     steps:
@@ -110,67 +110,30 @@ jobs:
       - run: cp -r /workspace/dist/ ./
       - run: xvfb-run -a node tests/run_e2e.js --nobuild --reuse=/workspace/angular-cli-e2e-default/test-project --nb-shards=4 --shard=3 --nosilent
 
-# E2E test for Angular nightly.
-  e2e-setup-nightly:
+  # Master only E2E.
+  ng2-e2e:
     <<: *defaults
     steps:
       - checkout
       - restore_cache:
           <<: *restore_cache_defaults
-      - run: mkdir /workspace
-      - run: mkdir /workspace/angular-cli-e2e-nightly
-      # Ignore all tests, we just want the setup step to persist it to the workspace.
-      - run: node tests/run_e2e.js --tmpdir=/workspace/angular-cli-e2e-nightly --ignore=**/* --nightly
-      - run: mv dist /workspace/
-      - persist_to_workspace:
-          root: /workspace
-          paths:
-            - dist/
-            - angular-cli-e2e-nightly/
+      - run: xvfb-run -a node tests/run_e2e.js --ng2 "--glob=tests/build/**"
 
-  e2e-0-nightly:
+  ng4-e2e:
     <<: *defaults
     steps:
       - checkout
       - restore_cache:
           <<: *restore_cache_defaults
-      - attach_workspace:
-          <<: *attach_workspace_defaults
-      - run: cp -r /workspace/dist/ ./
-      - run: xvfb-run -a node tests/run_e2e.js --nobuild --reuse=/workspace/angular-cli-e2e-nightly/test-project --nb-shards=4 --shard=0 --nosilent --nightly
+      - run: xvfb-run -a node tests/run_e2e.js --ng4 "--glob=tests/build/**"
 
-  e2e-1-nightly:
+  nightly-e2e:
     <<: *defaults
     steps:
       - checkout
       - restore_cache:
           <<: *restore_cache_defaults
-      - attach_workspace:
-          <<: *attach_workspace_defaults
-      - run: cp -r /workspace/dist/ ./
-      - run: xvfb-run -a node tests/run_e2e.js --nobuild --reuse=/workspace/angular-cli-e2e-nightly/test-project --nb-shards=4 --shard=1 --nosilent --nightly
-
-  e2e-2-nightly:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          <<: *restore_cache_defaults
-      - attach_workspace:
-          <<: *attach_workspace_defaults
-      - run: cp -r /workspace/dist/ ./
-      - run: xvfb-run -a node tests/run_e2e.js --nobuild --reuse=/workspace/angular-cli-e2e-nightly/test-project --nb-shards=4 --shard=2 --nosilent --nightly
-
-  e2e-3-nightly:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          <<: *restore_cache_defaults
-      - attach_workspace:
-          <<: *attach_workspace_defaults
-      - run: cp -r /workspace/dist/ ./
-      - run: xvfb-run -a node tests/run_e2e.js --nobuild --reuse=/workspace/angular-cli-e2e-nightly/test-project --nb-shards=4 --shard=3 --nosilent --nightly
+      - run: xvfb-run -a node tests/run_e2e.js --nightly "--glob=tests/build/**"
 
 workflows:
   version: 2
@@ -199,23 +162,19 @@ workflows:
       - e2e-3:
           requires:
             - e2e-setup
-      # E2E test for Angular nightly.
-      - e2e-setup-nightly:
-          requires:
-            - build
+      # Master only E2E.
+      - ng2-e2e:
+          filters:
+            branches:
+              only:
+                - master
+      - ng4-e2e:
+          filters:
+            branches:
+              only:
+                - master
+      - nightly-e2e:
           filters:
             branches:
               only:
                 - master
-      - e2e-0-nightly:
-          requires:
-            - e2e-setup-nightly
-      - e2e-1-nightly:
-          requires:
-            - e2e-setup-nightly
-      - e2e-2-nightly:
-          requires:
-            - e2e-setup-nightly
-      - e2e-3-nightly:
-          requires:
-            - e2e-setup-nightly