From c923185aee24e111589abf6efbd224ca3cd7079f Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail@gmail.com>
Date: Thu, 5 Oct 2023 15:50:25 +0200
Subject: [PATCH] buildbots config, cloudbuild and artifacts registry

---
 containers/buildbot-linux/cloudbuild.yaml  |  5 +++++
 containers/buildkite-linux/cloudbuild.yaml |  9 ++++-----
 kubernetes/buildbot/windows.yaml           | 15 ++++++++++++---
 kubernetes/buildkite/linux-test.yaml       |  2 +-
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 containers/buildbot-linux/cloudbuild.yaml

diff --git a/containers/buildbot-linux/cloudbuild.yaml b/containers/buildbot-linux/cloudbuild.yaml
new file mode 100644
index 0000000..23190ec
--- /dev/null
+++ b/containers/buildbot-linux/cloudbuild.yaml
@@ -0,0 +1,5 @@
+steps:
+- name: 'gcr.io/cloud-builders/docker'
+  args: [ 'build', '-t', 'us-central1-docker.pkg.dev/llvm-premerge-checks/docker/buildbot-linux', '.' ]
+images:
+- 'us-central1-docker.pkg.dev/llvm-premerge-checks/docker/buildbot-linux:latest'
\ No newline at end of file
diff --git a/containers/buildkite-linux/cloudbuild.yaml b/containers/buildkite-linux/cloudbuild.yaml
index cf2c0b7..a8ddaca 100644
--- a/containers/buildkite-linux/cloudbuild.yaml
+++ b/containers/buildkite-linux/cloudbuild.yaml
@@ -1,6 +1,5 @@
 steps:
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-t', 'gcr.io/${PROJECT_ID}/buildkite-premerge-debian:latest', '.']
-
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['push', 'gcr.io/${PROJECT_ID}/buildkite-premerge-debian:latest']
\ No newline at end of file
+- name: 'gcr.io/cloud-builders/docker'
+  args: [ 'build', '-t', 'us-central1-docker.pkg.dev/llvm-premerge-checks/docker/buildkite-linux', '.' ]
+images:
+- 'us-central1-docker.pkg.dev/llvm-premerge-checks/docker/buildkite-linux:latest'
\ No newline at end of file
diff --git a/kubernetes/buildbot/windows.yaml b/kubernetes/buildbot/windows.yaml
index b4928df..2c186a4 100644
--- a/kubernetes/buildbot/windows.yaml
+++ b/kubernetes/buildbot/windows.yaml
@@ -15,18 +15,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: buildbot-windows-test
+  name: buildbot-windows
 spec:
   replicas: 1
   strategy:
     type: Recreate
   selector:
     matchLabels:
-      app: buildbot-windows-test
+      app: buildbot-windows
   template:
     metadata:
       labels:
-        app: buildbot-windows-test
+        app: buildbot-windows
     spec:
       containers:
         - name: runner
@@ -44,6 +44,15 @@ spec:
           env:
             - name: WORKDIR
               value: "c:/ws" # matching workdir
+            - name: BUILDBOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: buildbot-premerge-windows-1
+                  key: password
+            - name: BUILDBOT_NAME
+              value: premerge-windows-1
+            - name: BUILDBOT_ADDRESS
+              value: lab.llvm.org:9994
       # Empty dir volume can use all disk space from VM. By default container
       # disk will only be 20Gb and run out of space.
       volumes:
diff --git a/kubernetes/buildkite/linux-test.yaml b/kubernetes/buildkite/linux-test.yaml
index b5891c5..066ae71 100644
--- a/kubernetes/buildkite/linux-test.yaml
+++ b/kubernetes/buildkite/linux-test.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
         - name: runner
-          image: gcr.io/llvm-premerge-checks/buildkite-linux:latest
+          image: us-central1-docker.pkg.dev/llvm-premerge-checks/docker/buildkite-linux:latest
           resources:
             limits:
               cpu: 31