diff --git a/bazel/integration/tests/angular-cli/angular.json b/bazel/integration/tests/angular-cli/angular.json index 5358b43f7..35e5f09bd 100644 --- a/bazel/integration/tests/angular-cli/angular.json +++ b/bazel/integration/tests/angular-cli/angular.json @@ -72,6 +72,7 @@ "options": { "tsConfig": "tsconfig.spec.json", "assets": ["src/favicon.ico", "src/assets"], + "browsers": "ChromeHeadlessNoSandbox", "styles": ["src/styles.css"], "scripts": [] } diff --git a/bazel/integration/tests/angular-cli/test/specs/example.e2e.ts b/bazel/integration/tests/angular-cli/test/specs/example.e2e.ts deleted file mode 100644 index a23254684..000000000 --- a/bazel/integration/tests/angular-cli/test/specs/example.e2e.ts +++ /dev/null @@ -1,7 +0,0 @@ -describe('start page', () => { - it('should work', async () => { - await browser.url(`http://localhost:4200`); - - expect(await $('body').getText()).toContain('What do you want to do next with your app?'); - }); -}); diff --git a/bazel/integration/tests/angular-cli/test/specs/tsconfig.json b/bazel/integration/tests/angular-cli/test/specs/tsconfig.json deleted file mode 100644 index a6ae5b823..000000000 --- a/bazel/integration/tests/angular-cli/test/specs/tsconfig.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "module": "commonjs", - "target": "es2015", - "types": [ - "node", - "webdriverio/sync", - "expect-webdriverio", - "@wdio/local-runner", - "@wdio/jasmine-framework", - "@wdio/spec-reporter" - ] - } -} diff --git a/bazel/integration/tests/angular-cli/test/wdio.conf.js b/bazel/integration/tests/angular-cli/test/wdio.conf.js deleted file mode 100644 index 32e9616b8..000000000 --- a/bazel/integration/tests/angular-cli/test/wdio.conf.js +++ /dev/null @@ -1,38 +0,0 @@ -exports.config = { - specs: [__dirname + '/specs/**/*.ts'], - capabilities: [ - { - browserName: 'chrome', - 'goog:chromeOptions': { - // Allows us to use Chromium provided by Bazel. - binary: process.env.CHROME_BIN, - // Needed so that the tests can run headless within Bazel and its sandbox. - args: ['--headless', '--no-sandbox', '--disable-gpu'], - }, - }, - ], - services: [ - [ - 'chromedriver', - { - // Allows us to use the chromedriver path provided by Bazel. - chromedriverCustomPath: process.env.CHROMEDRIVER_PATH, - }, - ], - ], - logLevel: 'warn', - baseUrl: 'http://localhost', - waitforTimeout: 10000, - connectionRetryTimeout: 120000, - connectionRetryCount: 3, - framework: 'jasmine', - reporters: ['spec'], - jasmineOpts: { - defaultTimeoutInterval: 60000, - }, - autoCompileOpts: { - tsNodeOpts: { - project: __dirname + '/specs/tsconfig.json', - }, - }, -}; diff --git a/bazel/remote-execution/BUILD.bazel b/bazel/remote-execution/BUILD.bazel index 77a899378..a8a59583a 100644 --- a/bazel/remote-execution/BUILD.bazel +++ b/bazel/remote-execution/BUILD.bazel @@ -15,7 +15,7 @@ platform( # from the image, the image doesn't need to be updated frequently. There are rare cases where # it needs to be updated. e.g. for a more recent Bash version, or new system settings that are # required for launching browsers. - "container-image": "docker://us-west2-docker.pkg.dev/internal-200822/remote-execution-images/angular-devinfra-rbe-image@sha256:3389d808edbcdf8999338fd617dda68cdbaa259b431f19e41e58941cdac900a3", + "container-image": "docker://us-west2-docker.pkg.dev/internal-200822/remote-execution-images/angular-devinfra-rbe-image@sha256:c853f16afdba9422f9e22548d32428a0b89e11987697c2aadd98dfa7977c7db1", # By default in Google Cloud Remote build execution, network access is disabled. We explicitly set the # property in the platform again in case the default ever changes. Network access is not desirable in # Bazel builds as it is potential source of flaky tests and therefore also breaks hermeticity. diff --git a/bazel/remote-execution/Dockerfile b/bazel/remote-execution/Dockerfile index f2173fded..082029f88 100644 --- a/bazel/remote-execution/Dockerfile +++ b/bazel/remote-execution/Dockerfile @@ -5,8 +5,8 @@ FROM ghcr.io/puppeteer/puppeteer:24.23.0@sha256:d7afe89d44cb5fc2d8a8ed16bf21817a # image- preventing us from preparing Firefox dependencies. USER root -# Perform update/upgrade with Debian bullseye added. Puppeteer uses -# `node:18` which does not have the repository added for installing Firefox. +# Perform update/upgrade with Debian bullseye added. +# This allows us to install Firefox for its dependencies. RUN echo 'deb http://deb.debian.org/debian bullseye main' >> /etc/apt/sources.list RUN apt-get -y update && apt-get -y upgrade diff --git a/bazel/remote-execution/README.md b/bazel/remote-execution/README.md index f81293281..25395223b 100644 --- a/bazel/remote-execution/README.md +++ b/bazel/remote-execution/README.md @@ -7,10 +7,10 @@ or from GitHub packages. Only `pkg.dev` or `gcr.io`. gcloud auth configure-docker \ us-west2-docker.pkg.dev -sudo docker build . --network=host -t angular-devinfra-rbe-image:latest +docker build . --network=host -t angular-devinfra-rbe-image:latest -sudo docker tag angular-devinfra-rbe-image:latest \ - us-west2-docker.pkg.dev/internal-200822/remote-execution-images/angular-devinfra-rbe-image:202305 +docker tag angular-devinfra-rbe-image:latest \ + us-west2-docker.pkg.dev/internal-200822/remote-execution-images/angular-devinfra-rbe-image:2025-10 -sudo docker push us-west2-docker.pkg.dev/internal-200822/remote-execution-images/angular-devinfra-rbe-image:202305 +docker push us-west2-docker.pkg.dev/internal-200822/remote-execution-images/angular-devinfra-rbe-image:2025-10 ````