diff --git a/.circleci/config.yml b/.circleci/config.yml index dd2ca6e0799..396cc1fd0e4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ executors: # step, and the saving the initial a workspace state. build-executor: docker: - - image: mozilla/fxa-circleci:ci-builder-v7 + - image: mozilla/fxa-circleci:ci-builder-v8 environment: NODE_ENV: development FIRESTORE_EMULATOR_HOST: localhost:9090 @@ -96,7 +96,7 @@ executors: default: medium resource_class: << parameters.resource_class >> docker: - - image: mozilla/fxa-circleci:ci-test-runner-v7 + - image: mozilla/fxa-circleci:ci-test-runner-v8 environment: NODE_ENV: development FIRESTORE_EMULATOR_HOST: localhost:9090 @@ -112,7 +112,7 @@ executors: default: large resource_class: << parameters.resource_class >> docker: - - image: mozilla/fxa-circleci:ci-test-runner-v7 + - image: mozilla/fxa-circleci:ci-test-runner-v8 - image: cimg/mysql:8.0 command: --default-authentication-plugin=mysql_native_password - image: jdlk7/firestore-emulator @@ -135,7 +135,7 @@ executors: default: xlarge resource_class: << parameters.resource_class >> docker: - - image: mozilla/fxa-circleci:ci-functional-test-runner-v7 + - image: mozilla/fxa-circleci:ci-functional-test-runner-v8 - image: redis - image: pafortin/goaws - image: cimg/mysql:8.0 @@ -190,7 +190,7 @@ executors: default: xlarge resource_class: << parameters.resource_class >> docker: - - image: mozilla/fxa-circleci:ci-functional-test-runner-v7 + - image: mozilla/fxa-circleci:ci-functional-test-runner-v8 environment: NODE_ENV: development CUSTOMS_SERVER_URL: none @@ -300,26 +300,12 @@ commands: name: Wait for Customs command: yarn workspace fxa-customs-server start - ensure-glean-venv: - steps: - - run: - name: Ensure Python venv has pip and glean_parser - command: | - set -euxo pipefail - - rm -rf .venv - python3 -m venv .venv - . .venv/bin/activate - - pip install --upgrade 'glean_parser~=14.5' - lint: parameters: nx_run: type: string default: run-many steps: - - ensure-glean-venv - run: name: Linting command: npx nx << parameters.nx_run >> --parallel=1 -t lint @@ -330,7 +316,6 @@ commands: type: string default: run-many steps: - - ensure-glean-venv - run: name: Pre building shared libraries command: NODE_OPTIONS="--max-old-space-size=7168" npx nx run-many -t build --projects=tag:scope:shared:lib --parallel=2 --verbose @@ -444,7 +429,6 @@ commands: type: string default: run-many steps: - - ensure-glean-venv - run: name: Build command: NODE_OPTIONS="--max-old-space-size=7168" npx nx << parameters.nx_run >> -t build --parallel=2 --all --verbose @@ -534,7 +518,7 @@ commands: docker build . \ -f ./project/_dev/docker/ci/Dockerfile \ --target << parameters.target >> \ - -t mozilla/fxa-circleci:ci-<< parameters.target >>-v7 + -t mozilla/fxa-circleci:ci-<< parameters.target >>-v8 create-fxa-ci-images: # Build CI images. Images are built on top of each other. Each is optimized for a specific task. @@ -563,10 +547,10 @@ commands: name: Push CI Images and Extract Yarn Cache command: | docker login -u $DOCKER_USER_fxa_circleci -p $DOCKER_PASS_fxa_circleci - .circleci/docker-copy-cache.sh mozilla/fxa-circleci:ci-builder-v7 - docker push mozilla/fxa-circleci:ci-test-runner-v7 - docker push mozilla/fxa-circleci:ci-functional-test-runner-v7 - docker push mozilla/fxa-circleci:ci-builder-v7 + .circleci/docker-copy-cache.sh mozilla/fxa-circleci:ci-builder-v8 + docker push mozilla/fxa-circleci:ci-test-runner-v8 + docker push mozilla/fxa-circleci:ci-functional-test-runner-v8 + docker push mozilla/fxa-circleci:ci-builder-v8 wait upload_to_gcs: @@ -729,7 +713,6 @@ jobs: - git-checkout - restore-workspace - gcp-cli/setup - - ensure-glean-venv - run: name: Build shared libs command: NODE_OPTIONS="--max-old-space-size=7168" npx nx run-many -t build --projects=tag:scope:shared:lib --parallel=2 @@ -869,7 +852,6 @@ jobs: sudo tee -a /etc/hosts \<<<'127.0.0.1 localhost' sudo cat /etc/hosts - wait-for-infrastructure - - ensure-glean-venv - run: name: Start services for playwright tests command: ./packages/functional-tests/scripts/start-services.sh diff --git a/_dev/docker/ci/Dockerfile b/_dev/docker/ci/Dockerfile index ba06aa57ef4..f9c9c70cd06 100644 --- a/_dev/docker/ci/Dockerfile +++ b/_dev/docker/ci/Dockerfile @@ -11,6 +11,8 @@ RUN sudo apt-get update && sudo apt-get install -y \ WORKDIR /home/circleci COPY --chown=circleci:circleci project project WORKDIR /home/circleci/project +RUN python3 -m venv .venv \ + && .venv/bin/pip install 'glean_parser~=14.5' RUN git rev-parse HEAD > base_ref; RUN cp yarn.lock yarn.lock.base; @@ -25,10 +27,7 @@ WORKDIR /home/circleci/project ENV YARN_CHECKSUM_BEHAVIOR=throw ENV FXA_AUTO_INSTALL=0 RUN _scripts/l10n/clone.sh -RUN yarn install --immutable \ - && rm -rf .venv \ - && python3 -m venv .venv \ - && .venv/bin/pip install 'glean_parser~=14.5' +RUN yarn install --immutable # Acts as an intermediate stage for adding the firefox install. Note, # that a yarn install must happen first to ensure the correct version @@ -49,4 +48,6 @@ WORKDIR /home/circleci COPY --chown=circleci:circleci --from=playwright-install /home/circleci/.cache/ms-playwright .cache/ms-playwright/ COPY --chown=circleci:circleci project project WORKDIR /home/circleci/project +RUN python3 -m venv .venv \ + && .venv/bin/pip install 'glean_parser~=14.5' COPY --chown=circleci:circleci install /usr/local/bin/ diff --git a/packages/fxa-settings/.storybook/preview.tsx b/packages/fxa-settings/.storybook/preview.tsx index 3e3b8879c5d..dcd59cf7d4c 100644 --- a/packages/fxa-settings/.storybook/preview.tsx +++ b/packages/fxa-settings/.storybook/preview.tsx @@ -76,3 +76,4 @@ export const parameters = { }, }, }; +