diff --git a/.bazelrc b/.bazelrc index 8f6104d88..3a2e10599 100644 --- a/.bazelrc +++ b/.bazelrc @@ -56,9 +56,9 @@ build:remote --auth_enabled=true # is provided by the shared dev-infra package and targets k8 remote containers. build:remote --crosstool_top=//bazel/remote-execution/cpp:cc_toolchain_suite build:remote --extra_toolchains=//bazel/remote-execution/cpp:cc_toolchain -build:remote --extra_execution_platforms=//bazel/remote-execution:platform -build:remote --host_platform=//bazel/remote-execution:platform -build:remote --platforms=//bazel/remote-execution:platform +build:remote --extra_execution_platforms=//bazel/remote-execution:platform_with_network +build:remote --host_platform=//bazel/remote-execution:platform_with_network +build:remote --platforms=//bazel/remote-execution:platform_with_network # Set remote caching settings build:remote --remote_accept_cached=true diff --git a/bazel/integration/tests/angular-cli/BUILD.bazel b/bazel/integration/tests/angular-cli/BUILD.bazel index 69dfb3027..9319742fd 100644 --- a/bazel/integration/tests/angular-cli/BUILD.bazel +++ b/bazel/integration/tests/angular-cli/BUILD.bazel @@ -14,11 +14,8 @@ integration_test( "@nodejs//:yarn_files", ], tags = [ - # Chromium cannot run in Sandbox. For this test, sandbox is disabled. - # Additionally, we need to disable RBE as this test relies on internet - # access for installing the NPM packages. - "no-sandbox", - "no-remote-exec", + # This test relies on `yarn` so there needs to be internet access. + "requires-network", ], tool_mappings = { "@nodejs//:yarn_bin": "yarn", diff --git a/bazel/integration/tests/angular-cli/karma.conf.js b/bazel/integration/tests/angular-cli/karma.conf.js index 7b5b559c3..feb805995 100644 --- a/bazel/integration/tests/angular-cli/karma.conf.js +++ b/bazel/integration/tests/angular-cli/karma.conf.js @@ -26,6 +26,12 @@ module.exports = function (config) { }, clearContext: false, // leave Jasmine Spec Runner output visible in browser }, + customLaunchers: { + ChromeHeadlessNoSandbox: { + base: 'ChromeHeadless', + flags: ['--no-sandbox'], + }, + }, jasmineHtmlReporter: { suppressAll: true, // removes the duplicated traces }, @@ -39,7 +45,9 @@ module.exports = function (config) { colors: true, logLevel: config.LOG_INFO, autoWatch: true, - browsers: ['ChromeHeadless'], + // Chrome cannot run with sandbox enabled as this test already runs within + // the Bazel sandbox environment and the sandboxes would conflict otherwise. + browsers: ['ChromeHeadlessNoSandbox'], singleRun: false, restartOnFileChange: true, });