From bcd1f943a5de46f03794415840ece7341cf910bd Mon Sep 17 00:00:00 2001 From: Seth Silesky <5115498+silesky@users.noreply.github.com> Date: Tue, 19 Nov 2024 15:50:02 -0600 Subject: [PATCH] try and simplify pipeline more --- .buildkite/Dockerfile.agent | 5 ----- .buildkite/Makefile | 7 ------- .buildkite/Readme.md | 11 ----------- .buildkite/pipeline.yml | 5 ++++- .nvmrc | 2 +- 5 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 .buildkite/Dockerfile.agent delete mode 100644 .buildkite/Makefile delete mode 100644 .buildkite/Readme.md diff --git a/.buildkite/Dockerfile.agent b/.buildkite/Dockerfile.agent deleted file mode 100644 index 7ef44e24b..000000000 --- a/.buildkite/Dockerfile.agent +++ /dev/null @@ -1,5 +0,0 @@ -FROM 528451384384.dkr.ecr.us-west-2.amazonaws.com/buildkite-agent-node20 - -RUN npx playwright install-deps - -ENTRYPOINT [] diff --git a/.buildkite/Makefile b/.buildkite/Makefile deleted file mode 100644 index c759c9e7f..000000000 --- a/.buildkite/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -ECR_REPOSITORY = 528451384384.dkr.ecr.us-west-2.amazonaws.com -IMAGE = ${ECR_REPOSITORY}/analytics-next-ci-agent:latest - -agent: - docker build --pull . -f Dockerfile.agent -t ${IMAGE} - aws-okta exec ops-write -- docker push ${IMAGE} -.PHONY: agent \ No newline at end of file diff --git a/.buildkite/Readme.md b/.buildkite/Readme.md deleted file mode 100644 index da5d625b6..000000000 --- a/.buildkite/Readme.md +++ /dev/null @@ -1,11 +0,0 @@ -# Buildkite - -## How to update the buildkite docker agent -1. Make your changes to `Dockerfile.agent`. -2. Push the changes to ecr -(will need `Ops Write` permission). -```bash -$ cd .buildkite -$ robo-tooling.docker.login-privileged -$ make agent -``` diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 993722c91..75a04b6fd 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,6 +1,6 @@ env: SEGMENT_CONTEXTS: 'snyk,npm,aws-credentials,ecr,npm-publish' - SEGMENT_BUILDKITE_IMAGE: 'analytics-next-ci-agent' + SEGMENT_BUILDKITE_IMAGE: 'buildkite-agent-node20' steps: - label: Log Environment agents: @@ -50,6 +50,7 @@ steps: commands: - npm config set "//registry.npmjs.org/:_authToken" $${NPM_TOKEN} - echo "--- Install dependencies" + - npx playwright install-deps - yarn install --immutable - echo "+++ Run QA Tests :pray:" - yarn run -T browser exec make test-qa @@ -68,6 +69,7 @@ steps: queue: v1 commands: - echo "--- Install dependencies" + - npx playwright install-deps - PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn install --immutable - PLAYWRIGHT_BROWSERS_PATH=$HOME/pw-browsers npx playwright install - echo "+++ Run Browser integration tests :pray:" @@ -158,6 +160,7 @@ steps: commands: - npm config set "//registry.npmjs.org/:_authToken" $${NPM_TOKEN} - echo "--- Install dependencies" + - npx playwright install-deps - yarn install --immutable - echo "+++ Run Destinations QA Tests :pray:" - yarn run -T browser exec make test-qa-destinations diff --git a/.nvmrc b/.nvmrc index f3f52b42d..d4c3d320c 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.9.0 +20.10