test: remove non-bazel test setup

Author: filipesilva

.circleci/config.yml

@@ -156,27 +156,6 @@ jobs:
       - custom_attach_workspace
       - run: yarn validate --ci
 
-  test:
-    executor: action-executor
-    steps:
-      - custom_attach_workspace
-      - run: yarn test --full
-
-  test-large:
-    parameters:
-      ve:
-        type: boolean
-        default: false
-      glob:
-        type: string
-        default: ""
-    executor: test-executor
-    parallelism: 4
-    steps:
-      - custom_attach_workspace
-      - run: yarn webdriver-update
-      - run: yarn test-large --full <<# parameters.ve >>--ve<</ parameters.ve >> <<# parameters.glob >>--glob="<< parameters.glob >>"<</ parameters.glob >> --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
-
   e2e-cli:
     parameters:
       ve:
@@ -242,25 +221,24 @@ jobs:
       - custom_attach_workspace
       - run: yarn build
 
-  # This is where we put all the misbehaving and flaky tests so we can fine-tune their conditions 
-  # and rerun them faster.
-  flake-jail:
+  test:
     executor: test-executor
-    resource_class: medium
+    resource_class: large
     steps:
       - custom_attach_workspace
+      - setup_bazel_rbe
       - run: yarn webdriver-update
-      - run: yarn test-large --full --flakey --ve
-      - run: yarn test-large --full --flakey
+      - run: yarn ngcc
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
+      - run: yarn bazel:test
 
-  build-bazel:
-    executor: action-executor
+  integration:
+    executor: test-executor
     resource_class: large
     steps:
       - custom_attach_workspace
-      - setup_bazel_rbe
-      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - run: yarn bazel:test
+      - run: 
+          command: yarn bazel:integration
 
   snapshot_publish:
     executor: action-executor
@@ -322,7 +300,6 @@ jobs:
     steps:
       - custom_attach_workspace
       - setup_windows
-      - run: yarn test --full
       # Run partial e2e suite on PRs only. Master will run the full e2e suite with sharding.
       - run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/{basic,ivy}/**" }
 
@@ -353,19 +330,10 @@ workflows:
             branches:
               ignore:
               - /docs-preview/
-      - build-bazel:
-          requires:
-            - build
       - test:
           requires:
             - build
-      - test-large:
-          requires:
-            - build
-      - test-large:
-          name: test-large-ve
-          ve: true
-          glob: "packages/angular_devkit/@(build_angular|build_ng_packagr)/@(src|test)/@(build|browser)/*_spec_large.ts"
+      - integration:
           requires:
             - build
       - e2e-cli:
@@ -408,9 +376,6 @@ workflows:
       - test-browsers:
           requires:
             - build
-      - flake-jail:
-          requires:
-            - build
 
       # Windows jobs
       # These jobs only run after their non-windows counterparts finish successfully.
@@ -423,8 +388,8 @@ workflows:
             - build
       - test-win:
           requires:
-            - setup-and-build-win
             - test
+            - setup-and-build-win
       - e2e-cli-win:
           <<: *only_release_branches
           requires:
@@ -435,13 +400,13 @@ workflows:
       - snapshot_publish:
           <<: *only_release_branches
           requires:
-            - test
             - build
+            - test
             - e2e-cli
       - publish:
           requires:
-            - test
             - build
+            - test
             - e2e-cli
             - snapshot_publish
           filters:

package.json

@@ -23,16 +23,15 @@
     "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier -v --warnings=attr-cfg,attr-license,attr-non-empty,attr-output-default,attr-single-file,constant-glob,ctx-args,depset-iteration,depset-union,dict-concatenation,duplicated-name,filetype,git-repository,http-archive,integer-division,load,load-on-top,native-build,native-package,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unused-variable",
     "bazel:lint": "yarn bazel:format --lint=warn",
     "bazel:lint-fix": "yarn bazel:format --lint=fix",
-    "bazel:test": "bazel test //...",
+    "bazel:test": "bazel test //packages/... //etc/... ",
+    "bazel:integration": "bazel test //integration/...",
     "build": "node ./bin/devkit-admin build",
     "build-tsc": "tsc -p tsconfig.json",
     "debug:test": "node --inspect-brk ./bin/devkit-admin test",
     "debug:test-large": "node --inspect-brk ./bin/devkit-admin test --large --spec-reporter",
     "fix": "node ./bin/devkit-admin lint --fix",
     "lint": "node ./bin/devkit-admin lint",
     "templates": "node ./bin/devkit-admin templates",
-    "test": "node ./bin/devkit-admin test",
-    "test-large": "node ./bin/devkit-admin test --large --spec-reporter",
     "validate": "node ./bin/devkit-admin validate",
     "validate-commits": "./bin/devkit-admin validate-commits",
     "preinstall": "node ./tools/yarn/check-yarn.js",

packages/angular/cli/BUILD.bazel

@@ -19,10 +19,7 @@ ts_library(
     name = "angular-cli",
     srcs = glob(
         ["**/*.ts"],
-        exclude = [
-            "**/*_spec.ts",
-            "**/*_spec_large.ts",
-        ],
+        exclude = ["**/*_spec.ts"],
     ) + [
         "//packages/angular/cli:lib/config/schema.ts",
         "//packages/angular/cli:commands/analytics.ts",
@@ -46,6 +43,7 @@ ts_library(
         "//packages/angular/cli:commands/xi18n.ts",
     ],
     data = glob([
+        "bin/**/*",
         "**/*.json",
         "**/*.md",
     ]),
@@ -232,12 +230,7 @@ ts_json_schema(
 ts_library(
     name = "angular-cli_test_lib",
     testonly = True,
-    srcs = glob(
-        include = [
-            "**/*_spec.ts",
-            "**/*_spec_large.ts",
-        ],
-    ),
+    srcs = glob(["**/*_spec.ts"]),
     devmode_module = "commonjs",
     devmode_target = "es2018",
     # strict_checks = False,

packages/angular/pwa/BUILD.bazel

@@ -23,7 +23,6 @@ ts_library(
         exclude = [
             "pwa/files/**/*",
             "**/*_spec.ts",
-            "**/*_spec_large.ts",
         ],
     ) + [
         "//packages/angular/pwa:pwa/schema.ts",
@@ -56,12 +55,7 @@ ts_json_schema(
 ts_library(
     name = "pwa_test_lib",
     testonly = True,
-    srcs = glob(
-        include = [
-            "pwa/**/*_spec.ts",
-            "pwa/**/*_spec_large.ts",
-        ],
-    ),
+    srcs = glob(["pwa/**/*_spec.ts"]),
     devmode_module = "commonjs",
     devmode_target = "es2018",
     # strict_checks = False,

packages/angular_devkit/architect/BUILD.bazel

@@ -41,10 +41,7 @@ ts_library(
     name = "architect",
     srcs = glob(
         include = ["src/**/*.ts"],
-        exclude = [
-            "**/*_spec.ts",
-            "**/*_spec_large.ts",
-        ],
+        exclude = ["**/*_spec.ts"],
     ) + [
         "//packages/angular_devkit/architect:src/input-schema.ts",
         "//packages/angular_devkit/architect:src/output-schema.ts",
@@ -68,12 +65,7 @@ ts_library(
 ts_library(
     name = "architect_test_lib",
     testonly = True,
-    srcs = glob(
-        include = [
-            "src/**/*_spec.ts",
-            "src/**/*_spec_large.ts",
-        ],
-    ),
+    srcs = glob(["src/**/*_spec.ts"]),
     devmode_module = "commonjs",
     devmode_target = "es2018",
     # strict_checks = False,

packages/angular_devkit/architect/node/BUILD.bazel

@@ -13,10 +13,7 @@ ts_library(
     name = "node",
     srcs = glob(
         include = ["**/*.ts"],
-        exclude = [
-            "**/*_spec.ts",
-            "**/*_spec_large.ts",
-        ],
+        exclude = ["**/*_spec.ts"],
     ),
     devmode_module = "commonjs",
     devmode_target = "es2018",

packages/angular_devkit/architect/testing/BUILD.bazel

@@ -13,10 +13,7 @@ ts_library(
     name = "testing",
     srcs = glob(
         include = ["**/*.ts"],
-        exclude = [
-            "**/*_spec.ts",
-            "**/*_spec_large.ts",
-        ],
+        exclude = ["**/*_spec.ts"],
     ),
     devmode_module = "commonjs",
     devmode_target = "es2018",

packages/angular_devkit/benchmark/BUILD.bazel

@@ -18,7 +18,6 @@ ts_library(
         include = ["src/**/*.ts"],
         exclude = [
             "src/**/*_spec.ts",
-            "src/**/*_spec_large.ts",
             "src/**/*_benchmark.ts",
         ],
     ),
@@ -38,12 +37,7 @@ ts_library(
 ts_library(
     name = "benchmark_test_lib",
     testonly = True,
-    srcs = glob(
-        include = [
-            "src/**/*_spec.ts",
-            "src/**/*_spec_large.ts",
-        ],
-    ),
+    srcs = glob(["src/**/*_spec.ts"]),
     data = [
         "src/test/exit-code-one.js",
         "src/test/fibonacci.js",

packages/angular_devkit/build_angular/BUILD.bazel

@@ -302,7 +302,7 @@ LARGE_SPECS = {
         ],
     },
     "browser": {
-        "shards": 30,
+        "shards": 50,
         "size": "large",
         "flaky": True,
         "extra_deps": [
@@ -359,7 +359,7 @@ LARGE_SPECS = {
         name = "build_angular_" + spec + "_test",
         size = LARGE_SPECS[spec].get("size", "medium"),
         flaky = LARGE_SPECS[spec].get("flaky", False),
-        shard_count = LARGE_SPECS[spec].get("shards", 1),
+        shard_count = LARGE_SPECS[spec].get("shards", 2),
         # These tests are resource intensive and should not be over-parallized as they will
         # compete for the resources of other parallel tests slowing everything down.
         # Ask Bazel to allocate multiple CPUs for these tests with "cpu:n" tag.