fixup! feat: add angular example

bazel-contrib · Sep 12, 2019 · 607db0a · 607db0a
1 parent 1e98b49
commit 607db0a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 57 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -72,16 +72,6 @@ tasks:
     # TODO(gregmagolan): make node_repositories acccept different archives for different platforms
     - "//examples:examples_vendored_node"
     - "//examples:examples_vendored_node_and_yarn"
-  # ubuntu1604_angular_bazel_example:
-    # name: ubuntu1604_angular_bazel_example
-    # platform: ubuntu1604
-    # bazel-in-bazel angular_bazel_example fails on ubuntu as the bazelci
-    # ubuntu docker image is missing shares libs required for the versions
-    # of chrome and firefox fetched by rules_webtesting. On circleci
-    # we have the same issue but we can work around it using apt-get.
-    # on bazelci apt-get fails with permission denied and there is no sudo
-    # command to switch to root.
-    # TODO(gregmagolan): figure out how to install the shared libs on bazelci
   ubuntu1804:
     name: ubuntu1804
     platform: ubuntu1804
@@ -167,16 +157,6 @@ tasks:
     # TODO(gregmagolan): make node_repositories acccept different archives for different platforms
     - "//examples:examples_vendored_node"
     - "//examples:examples_vendored_node_and_yarn"
-  # ubuntu1804_angular_bazel_example:
-    # name: ubuntu1804_angular_bazel_example
-    # platform: ubuntu1804
-    # bazel-in-bazel angular_bazel_example fails on ubuntu as the bazelci
-    # ubuntu docker image is missing shares libs required for the versions
-    # of chrome and firefox fetched by rules_webtesting. On circleci
-    # we have the same issue but we can work around it using apt-get.
-    # on bazelci apt-get fails with permission denied and there is no sudo
-    # command to switch to root.
-    # TODO(gregmagolan): figure out how to install the shared libs on bazelci
   macos:
     name: macos
     platform: macos
@@ -246,30 +226,6 @@ tasks:
     - "--test_arg=--test_tag_filters=-no-bazelci,-no-bazelci-mac,-manual"
     test_targets:
     - "//..."
-  macos_angular_bazel_example:
-    name: macos_angular_bazel_example
-    platform: macos
-    # We need to reduce the memory & CPU usage of the top-level
-    # bazel process for bazel-in-bazel tests to not deplete the
-    # system memory completely.
-    # - startup JVM memory reduced
-    # - top-level bazel process should use as little memory as possible and only 1 core
-    # - nested bazel process should use a limited number of cores
-    shell_commands:
-    - echo 'startup --host_jvm_args=-Xms256m --host_jvm_args=-Xmx1536m' >> .bazelrc
-    build_targets:
-    # Split up the build & test as test takes a long time and has very
-    # little output so running build first makes CI output friendlier.
-    # The build step can also use up more memory which may be required
-    # to build the release package with this configuration.
-    - "//e2e:e2e_angular_bazel_example"
-    test_flags:
-    - "--local_resources=792,1.0,1.0"
-    # test_args will be passed to the nested bazel process
-    - "--test_arg=--local_resources=14336,4.0,1.0"
-    - "--test_arg=--test_tag_filters=-no-bazelci,-manual"
-    test_targets:
-    - "//e2e:e2e_angular_bazel_example"
   macos_cross_compile:
     name: macos_cross_compile
     platform: macos
@@ -328,19 +284,6 @@ tasks:
     - "--test_arg=--local_resources=13288,1.0,1.0"
     test_targets:
     - "//..."
-  # windows_angular_bazel_example:
-    # name: windows_angular_bazel_example
-    # platform: windows
-    # bazel-in-bazel angular_bazel_example fails on Windows on bazelci cloning a git repo:
-    # ```
-    # ERROR: no such package '@io_bazel_rules_k8s//k8s': Traceback (most recent call last):
-    # 	File "D:/b/ftxm343s/execroot/build_bazel_rules_nodejs/_tmp/3726d3573001cb4068a18af89eb255de/_bazel_b/ktluxf26/external/bazel_tools/tools/build_defs/repo/git.bzl", line 163
-    # 		_clone_or_update(ctx)
-    # 	File "D:/b/ftxm343s/execroot/build_bazel_rules_nodejs/_tmp/3726d3573001cb4068a18af89eb255de/_bazel_b/ktluxf26/external/bazel_tools/tools/build_defs/repo/git.bzl", line 36, in _clone_or_update
-    # 		git_repo(ctx, directory)
-    # ```
-    # This is most likely due to a memory issue with this large bazel-in-bazel test.
-    # TODO(gregmagolan): figure out what is broken with the above
   windows_cross_compile:
     name: windows_cross_compile
     platform: windows

diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
@@ -21,6 +21,27 @@ example_integration_test(
         "//packages/protractor:npm_package": "@bazel/protractor",
         "//packages/typescript:npm_package": "@bazel/typescript",
     },
+    tags = [
+        # bazel-in-bazel angular_bazel_example fails on ubuntu as the bazelci
+        # ubuntu docker image is missing shares libs required for the versions
+        # of chrome and firefox fetched by rules_webtesting. On circleci
+        # we have the same issue but we can work around it using apt-get.
+        # on bazelci apt-get fails with permission denied and there is no sudo
+        # command to switch to root.
+        # TODO(gregmagolan): figure out how to install the shared libs on bazelci
+        "no-bazelci-ubuntu",
+        # bazel-in-bazel angular_bazel_example fails on Windows on bazelci cloning a git repo:
+        # ```
+        # ERROR: no such package '@io_bazel_rules_k8s//k8s': Traceback (most recent call last):
+        # 	File "D:/b/ftxm343s/execroot/build_bazel_rules_nodejs/_tmp/3726d3573001cb4068a18af89eb255de/_bazel_b/ktluxf26/external/bazel_tools/tools/build_defs/repo/git.bzl", line 163
+        # 		_clone_or_update(ctx)
+        # 	File "D:/b/ftxm343s/execroot/build_bazel_rules_nodejs/_tmp/3726d3573001cb4068a18af89eb255de/_bazel_b/ktluxf26/external/bazel_tools/tools/build_defs/repo/git.bzl", line 36, in _clone_or_update
+        # 		git_repo(ctx, directory)
+        # ```
+        # This is most likely due to a memory issue with this large bazel-in-bazel test.
+        # TODO(gregmagolan): figure out what is broken with the above
+        "no-bazelci-windows",
+    ],
 )
 
 example_integration_test(