initial deployment of clangd-ubuntu-clang
diff --git a/buildbot/google/docker/buildbot-clangd-ubuntu-clang/Dockerfile b/buildbot/google/docker/buildbot-clangd-ubuntu-clang/Dockerfile
index 4b2155c..5a07d2f 100644
--- a/buildbot/google/docker/buildbot-clangd-ubuntu-clang/Dockerfile
+++ b/buildbot/google/docker/buildbot-clangd-ubuntu-clang/Dockerfile
@@ -43,7 +43,9 @@
tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null ;\
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' ;\
apt-get update ;\
- apt-get install -y cmake
+ apt-get install -y cmake ;\
+ # clean apt cache to reduce image size
+ apt-get clean
# install build bot (server was at 2.8.5-dev at time of writing)
RUN pip3 install buildbot-worker==2.8.4
diff --git a/buildbot/google/docker/buildbot-clangd-ubuntu-clang/VERSION b/buildbot/google/docker/buildbot-clangd-ubuntu-clang/VERSION
index c227083..d00491f 100644
--- a/buildbot/google/docker/buildbot-clangd-ubuntu-clang/VERSION
+++ b/buildbot/google/docker/buildbot-clangd-ubuntu-clang/VERSION
@@ -1 +1 @@
-0
\ No newline at end of file
+1
diff --git a/buildbot/google/terraform/main.tf b/buildbot/google/terraform/main.tf
index 7a668a1..b0d7091 100644
--- a/buildbot/google/terraform/main.tf
+++ b/buildbot/google/terraform/main.tf
@@ -274,8 +274,8 @@
}
-resource "google_container_node_pool" "nvidia_16core_pool_nodes" {
- name = "nvidia-16core-pool"
+resource "google_container_node_pool" "linux_16_core_pool" {
+ name = "linux-16-core-pool"
# specify a zone here (e.g. "-a") to avoid a redundant deployment
location = var.gcp_config.zone_a
cluster = google_container_cluster.primary.name
@@ -303,17 +303,17 @@
# add a label to all machines of this type, so we can select them
# during deployment
labels = {
- pool = "linux-generic-pool"
+ pool = "linux-16-core-pool"
}
}
}
-resource "kubernetes_deployment" "ubuntu_clang" {
+resource "kubernetes_deployment" "clangd-ubuntu-clang" {
metadata {
- name = "ubuntu-clang"
+ name = "clangd-ubuntu-clang"
labels = {
- app = "ubuntu-clang"
+ app = "clangd-ubuntu-clang"
}
}
@@ -323,7 +323,7 @@
selector {
match_labels = {
- app = "ubuntu-clang"
+ app = "clangd-ubuntu-clang"
}
}
strategy{
@@ -339,14 +339,14 @@
template {
metadata {
labels = {
- app = "ubuntu-clang"
+ app = "clangd-ubuntu-clang"
}
}
spec {
container {
- image = "${var.gcp_config.gcr_prefix}/buildbot-ubuntu-clang:1"
- name = "buildbot-ubuntu-clang"
+ image = "${var.gcp_config.gcr_prefix}/buildbot-clangd-ubuntu-clang:1"
+ name = "buildbot-clangd-ubuntu-clang"
# reserve "<number of cores>-1" for this image, kubernetes also
# needs <1 core for management tools
@@ -377,7 +377,7 @@
}
# select which node pool to deploy to
node_selector = {
- pool = "linux-generic-pool"
+ pool = "linux-16-core-pool"
}
# restart in case of any crashes
restart_policy = "Always"
@@ -387,11 +387,11 @@
name = "buildbot-token"
secret {
optional = false
- secret_name = "password-windows10-vs2019"
+ secret_name = "password-clangd-ubuntu-clang"
}
}
volume {
- name = "sccache-vol"
+ name = "ccache-vol"
empty_dir {}
}
volume {
