Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate CI from AWS queues to Google Kubernetes Engine queues #1333

Merged
merged 2 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 94 additions & 33 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,93 +1,154 @@
container:
kubernetes: &kubernetes
gitEnvFrom:
- secretRef:
name: oss-github-ssh-credentials
sidecars:
- image: us-west1-docker.pkg.dev/ci-compute/buildkite-images/buildkite-dind:v1
volumeMounts:
- mountPath: /var/run/
name: docker-sock
securityContext:
privileged: true
allowPrivilegeEscalation: true
mirrorVolumeMounts: true # CRITICAL: this must be at the same indentation level as sidecars
podSpec: &podSpec
containers:
- &commandContainer
image: us-west1-docker.pkg.dev/ci-compute/buildkite-images/buildkite-command-container:v2
command:
- |-
echo "Command step was not overridden."
exit 1
volumeMounts:
- mountPath: /var/run/
name: docker-sock
resources:
requests:
cpu: 7500m
memory: 28G
volumes:
- name: docker-sock
emptyDir: {}

agents:
queue: "buildkite-gcp"
steps:
- label: "fossa analyze"
agents:
queue: "init"
docker: "*"
command: ".buildkite/scripts/fossa.sh"

- label: ":golang: unit-test"
agents:
queue: "workers"
docker: "*"
commands:
- "make unit_test"
- ".buildkite/scripts/gen_coverage_metadata.sh .build/metadata.txt"
artifact_paths:
- ".build/*/coverage/*.out"
- ".build/cover.out"
- ".build/metadata.txt"
plugins:
- kubernetes:
<<: *kubernetes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mstifflin your yaml fu is way beyond mine, I assume this means destructuring the k8s block defined ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I definitely learned something new working on this. This syntax basically allows me to overwrite just the command step in that nested kubernetes block.

podSpec:
<<: *podSpec
containers:
- <<: *commandContainer
command:
- |-
make unit_test
.buildkite/scripts/gen_coverage_metadata.sh .build/metadata.txt
- docker-compose#v3.0.0:
run: unit-test
config: docker/buildkite/docker-compose.yml

- label: ":golangci-lint: validate code is clean"
agents:
queue: "workers"
docker: "*"
command: "./scripts/golint.sh"
artifact_paths: [ ]
retry:
automatic:
limit: 1
limit: 2
plugins:
- kubernetes:
<<: *kubernetes
podSpec:
<<: *podSpec
containers:
- <<: *commandContainer
command:
- |-
./scripts/golint.sh
- docker-compose#v3.0.0:
run: unit-test
config: docker/buildkite/docker-compose.yml

- label: ":golang: integration-test-sticky-off"
agents:
queue: "workers"
docker: "*"
command: "make integ_test_sticky_off"
artifact_paths:
- ".build/*/coverage/*.out"
retry:
automatic:
limit: 1
limit: 2
plugins:
- kubernetes:
<<: *kubernetes
podSpec:
<<: *podSpec
containers:
- <<: *commandContainer
command:
- |-
make integ_test_sticky_off
- docker-compose#v3.0.0:
run: integ-test
config: docker/buildkite/docker-compose.yml

- label: ":golang: integration-test-sticky-on"
agents:
queue: "workers"
docker: "*"
command: "make integ_test_sticky_on"
artifact_paths:
- ".build/*/coverage/*.out"
retry:
automatic:
limit: 1
limit: 2
plugins:
- kubernetes:
<<: *kubernetes
podSpec:
<<: *podSpec
containers:
- <<: *commandContainer
command:
- |-
make integ_test_sticky_on
- docker-compose#v3.0.0:
run: integ-test
config: docker/buildkite/docker-compose.yml

- label: ":golang: integration-test-grpc-adapter"
agents:
queue: "workers"
docker: "*"
command: "make integ_test_grpc"
artifact_paths:
- ".build/*/coverage/*.out"
retry:
automatic:
limit: 1
limit: 2
plugins:
- kubernetes:
<<: *kubernetes
podSpec:
<<: *podSpec
containers:
- <<: *commandContainer
command:
- |-
make integ_test_grpc
- docker-compose#v3.0.0:
run: integ-test-grpc
config: docker/buildkite/docker-compose.yml

- wait

- label: ":golang: code-coverage"
agents:
queue: "workers"
docker: "*"
command: ".buildkite/scripts/gocov.sh"
plugins:
- kubernetes:
<<: *kubernetes
podSpec:
<<: *podSpec
containers:
- <<: *commandContainer
command:
- |-
.buildkite/scripts/gocov.sh
- docker-compose#v3.0.0:
run: coverage-report
config: docker/buildkite/docker-compose.yml
15 changes: 15 additions & 0 deletions docker/buildkite/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,18 @@ ADD go.mod go.sum /go/src/go.uber.org/cadence/
# allow git-status and similar to work
RUN git config --global --add safe.directory /go/src/go.uber.org/cadence
RUN GO111MODULE=on go mod download

# Install dependencies needed to install buildkite-agent
RUN apt-get install -y apt-transport-https dirmngr curl

# Add Buildkite's GPG key
RUN curl -fsSL https://keys.openpgp.org/vks/v1/by-fingerprint/32A37959C2FA5C3C99EFBC32A79206696452D198 | \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

may I ask as to the source of this? Is his on BK's docs somewhere?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me add that as a comment

gpg --dearmor -o /usr/share/keyrings/buildkite-agent-archive-keyring.gpg

# Add the repository to Apt sources
RUN echo \
"deb [signed-by=/usr/share/keyrings/buildkite-agent-archive-keyring.gpg] https://apt.buildkite.com/buildkite-agent stable main" | \
tee /etc/apt/sources.list.d/buildkite-agent.list

# Install Buildkite agent
RUN apt-get update && apt-get install -yy --no-install-recommends buildkite-agent
1 change: 0 additions & 1 deletion docker/buildkite/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ services:
- "GO111MODULE=on"
volumes:
- ../../:/go/src/go.uber.org/cadence
- /usr/bin/buildkite-agent:/usr/bin/buildkite-agent

networks:
services-network:
Expand Down
Loading