1
0
Fork 0

misc ci updates

don't checkout to the same repo on linux - that actually saves time

--tags-from-gcp for easy targeting and agent info
This commit is contained in:
Mikhail Goncharov 2023-09-07 13:08:28 +02:00
parent 814eefcdc9
commit 47d20a3302
9 changed files with 18 additions and 100 deletions

View file

@ -84,4 +84,4 @@ COPY --chown=buildkite-agent:buildkite-agent pre-checkout /etc/buildkite-agent/h
VOLUME /var/lib/buildkite-agent VOLUME /var/lib/buildkite-agent
ENTRYPOINT ["entrypoint.sh"] ENTRYPOINT ["entrypoint.sh"]
CMD ["gosu", "buildkite-agent", "buildkite-agent", "start", "--no-color"] CMD ["gosu", "buildkite-agent", "buildkite-agent", "start", "--no-color", "--tags-from-gcp"]

View file

@ -21,7 +21,7 @@ set -o pipefail
# Convert https://github.com/llvm-premerge-tests/llvm-project.git -> llvm-project # Convert https://github.com/llvm-premerge-tests/llvm-project.git -> llvm-project
# to use the same directory for fork and origin. # to use the same directory for fork and origin.
BUILDKITE_BUILD_CHECKOUT_PATH="${BUILDKITE_BUILD_PATH}/$(echo $BUILDKITE_REPO | sed -E "s#.*/([^/]*)#\1#" | sed "s/.git$//")" # BUILDKITE_BUILD_CHECKOUT_PATH="${BUILDKITE_BUILD_PATH}/$(echo $BUILDKITE_REPO | sed -E "s#.*/([^/]*)#\1#" | sed "s/.git$//")"
gc_counter="$BUILDKITE_BUILD_PATH/git_gc_counter" gc_counter="$BUILDKITE_BUILD_PATH/git_gc_counter"
echo "BUILDKITE_REPO: $BUILDKITE_REPO" echo "BUILDKITE_REPO: $BUILDKITE_REPO"
if [ -d "$BUILDKITE_BUILD_CHECKOUT_PATH" ]; then if [ -d "$BUILDKITE_BUILD_CHECKOUT_PATH" ]; then
@ -30,7 +30,7 @@ if [ -d "$BUILDKITE_BUILD_CHECKOUT_PATH" ]; then
echo "current remote URL: $remoteUrl" echo "current remote URL: $remoteUrl"
if [ "$remoteUrl" != "$BUILDKITE_REPO" ]; then if [ "$remoteUrl" != "$BUILDKITE_REPO" ]; then
echo "Remote URL does not match. Deleting and recreating the directory." echo "Remote URL does not match. Deleting and recreating the directory."
cd /c/ cd $BUILDKITE_BUILD_PATH
rm -rf "$BUILDKITE_BUILD_CHECKOUT_PATH" rm -rf "$BUILDKITE_BUILD_CHECKOUT_PATH"
rm -rf "$gc_counter" rm -rf "$gc_counter"
else else

View file

@ -1,82 +0,0 @@
# Copyright 2021 Google LLC
#
# Licensed under the the Apache License v2.0 with LLVM Exceptions (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://llvm.org/LICENSE.txt
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: apps/v1
kind: Deployment
metadata:
name: linux-56
namespace: buildkite
spec:
replicas: 3
strategy:
rollingUpdate:
maxUnavailable: 1
maxSurge: 0
type: RollingUpdate
selector:
matchLabels:
app: linux-56
template:
metadata:
labels:
app: linux-56
spec:
containers:
- name: runner
image: gcr.io/llvm-premerge-checks/buildkite-linux:latest
resources:
limits:
cpu: 55
memory: 200Gi
requests:
cpu: 55
memory: 200Gi
volumeMounts:
- name: github-ssh
mountPath: /mnt/ssh
- name: workdir
mountPath: /var/lib/buildkite-agent
env:
- name: BUILDKITE_AGENT_TOKEN
valueFrom:
secretKeyRef:
name: buildkite-agent-token
key: token
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: BUILDKITE_AGENT_TAGS
value: "queue=linux,name=$(POD_NAME),cluster=google,node-pool=linux-56"
- name: BUILDKITE_BUILD_PATH
value: "/var/lib/buildkite-agent/builds"
- name: CONDUIT_TOKEN
valueFrom:
secretKeyRef:
name: conduit-api-token
key: token
- name: BUILDKITE_API_TOKEN
valueFrom:
secretKeyRef:
name: buildkite-api-token-readonly
key: token
volumes:
- name: github-ssh
secret:
secretName: github-ssh
- name: workdir
emptyDir: {}
nodeSelector:
cloud.google.com/gke-nodepool: linux-56
terminationGracePeriodSeconds: 30

View file

@ -58,7 +58,7 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
- name: BUILDKITE_AGENT_TAGS - name: BUILDKITE_AGENT_TAGS
value: "queue=linux-test,name=$(POD_NAME),cluster=google,node-pool=linux-agents-2" value: "queue=linux-test,pod-name=$(POD_NAME)"
- name: BUILDKITE_BUILD_PATH - name: BUILDKITE_BUILD_PATH
value: "/var/lib/buildkite-agent/builds" value: "/var/lib/buildkite-agent/builds"
- name: CONDUIT_TOKEN - name: CONDUIT_TOKEN

View file

@ -15,10 +15,10 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: linux name: linux-56
namespace: buildkite namespace: buildkite
spec: spec:
replicas: 2 replicas: 3
strategy: strategy:
rollingUpdate: rollingUpdate:
maxUnavailable: 1 maxUnavailable: 1
@ -26,22 +26,22 @@ spec:
type: RollingUpdate type: RollingUpdate
selector: selector:
matchLabels: matchLabels:
app: linux app: linux-56
template: template:
metadata: metadata:
labels: labels:
app: linux app: linux-56
spec: spec:
containers: containers:
- name: runner - name: runner
image: gcr.io/llvm-premerge-checks/buildkite-linux:latest image: gcr.io/llvm-premerge-checks/buildkite-linux:latest
resources: resources:
limits: limits:
cpu: 30 cpu: 55
memory: 80Gi memory: 200Gi
requests: requests:
cpu: 30 cpu: 55
memory: 80Gi memory: 200Gi
volumeMounts: volumeMounts:
- name: github-ssh - name: github-ssh
mountPath: /mnt/ssh mountPath: /mnt/ssh
@ -58,7 +58,7 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
- name: BUILDKITE_AGENT_TAGS - name: BUILDKITE_AGENT_TAGS
value: "queue=linux,name=$(POD_NAME),cluster=google,node-pool=linux-agents-2" value: "queue=linux,pod-name=$(POD_NAME)"
- name: BUILDKITE_BUILD_PATH - name: BUILDKITE_BUILD_PATH
value: "/var/lib/buildkite-agent/builds" value: "/var/lib/buildkite-agent/builds"
- name: CONDUIT_TOKEN - name: CONDUIT_TOKEN
@ -78,5 +78,5 @@ spec:
- name: workdir - name: workdir
emptyDir: {} emptyDir: {}
nodeSelector: nodeSelector:
cloud.google.com/gke-nodepool: linux-agents-2 cloud.google.com/gke-nodepool: linux-56
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30

View file

@ -56,7 +56,7 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
- name: BUILDKITE_AGENT_TAGS - name: BUILDKITE_AGENT_TAGS
value: "queue=service-test,name=$(POD_NAME),cluster=google" value: "queue=service-test,pod-name=$(POD_NAME)"
- name: BUILDKITE_BUILD_PATH - name: BUILDKITE_BUILD_PATH
value: "/var/lib/buildkite-agent/builds" value: "/var/lib/buildkite-agent/builds"
- name: CONDUIT_TOKEN - name: CONDUIT_TOKEN

View file

@ -56,7 +56,7 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
- name: BUILDKITE_AGENT_TAGS - name: BUILDKITE_AGENT_TAGS
value: "queue=service,name=$(POD_NAME),cluster=google" value: "queue=service,pod-name=$(POD_NAME)"
- name: CONDUIT_TOKEN - name: CONDUIT_TOKEN
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View file

@ -52,7 +52,7 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
- name: BUILDKITE_AGENT_TAGS - name: BUILDKITE_AGENT_TAGS
value: "queue=windows-test-32,cluster=google" value: "queue=windows-test-32,pod-name=$(POD_NAME)"
- name: BUILDKITE_API_TOKEN - name: BUILDKITE_API_TOKEN
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View file

@ -52,7 +52,7 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
- name: BUILDKITE_AGENT_TAGS - name: BUILDKITE_AGENT_TAGS
value: "queue=windows,cluster=google" value: "queue=windows,pod-name=$(POD_NAME)"
- name: BUILDKITE_API_TOKEN - name: BUILDKITE_API_TOKEN
valueFrom: valueFrom:
secretKeyRef: secretKeyRef: