Skip to content

Commit 3a37b4f

Browse files
[CI] Update documentation after windows version bump
As part of bumping all of the windows testing from server 2019 to server 2022, we added the windows server addition to all the associated resources. The documentation was not updated to reflect this patch, which this patch now does. Reviewers: lnihlen, Keenuts, gburgessiv, dschuff, cmtice Reviewed By: cmtice Pull Request: #511
1 parent 18c7e80 commit 3a37b4f

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

premerge/architecture.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Our runners are hosted on GCP Kubernetes clusters, and use the
5050
The clusters have 4 main pools:
5151
- llvm-premerge-linux
5252
- llvm-premerge-linux-service
53-
- llvm-premerge-windows
53+
- llvm-premerge-windows-2022
5454
- llvm-premerge-libcxx
5555

5656
**llvm-premerge-linux-service** is a fixed pool, only used to host the
@@ -61,7 +61,7 @@ monitoring). Today, this pool has three `e2-highcpu-4` machine.
6161
VMs. This pool runs the Linux workflows. In the US West cluster, the machines
6262
are `n2d-standard-64` due to quota limitations.
6363

64-
**llvm-premerge-windows** is a auto-scaling pool with large `n2-standard-32`
64+
**llvm-premerge-windows-2022** is a auto-scaling pool with large `n2-standard-32`
6565
VMs. Similar to the Linux pool, but this time it runs Windows workflows. In the
6666
US West cluster, the machines are `n2d-standard-32` due to quota limitations.
6767

@@ -93,7 +93,7 @@ How a job is run:
9393
- If the instance is not reused in the next 10 minutes, the autoscaler
9494
will turn down the instance, freeing resources.
9595

96-
### Worker pools : llvm-premerge-linux, llvm-premerge-windows, llvm-premerge-libcxx
96+
### Worker pools : llvm-premerge-linux, llvm-premerge-windows-2022, llvm-premerge-libcxx
9797

9898
To make sure each runner pod is scheduled on the correct pool (linux or
9999
windows, avoiding the service pool), we use labels and taints.

premerge/cluster-management.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ The main part you want too look into is `Menu > Kubernetes Engine > Clusters`.
3333

3434
Currently, we have 4 clusters:
3535
- `llvm-premerge-checks`: the cluster hosting BuildKite Linux runners.
36-
- `windows-cluster`: the cluster hosting BuildKite Windows runners.
3736
- `llvm-premerge-cluster-us-central`: The first cluster for GCP hosted runners.
3837
- `llvm-premerge-cluster-us-west`: The second cluster for GCP hosted runners.
3938

40-
`llvm-premerge-checks` and `windows-cluster` are part of the old Buildkite
39+
`llvm-premerge-checks` is part of the old Buildkite
4140
infrastructure. For the new infrastructure, we have two clusters,
4241
`llvm-premerge-cluster-us-central` and `llvm-premerge-cluster-us-west` for GCP
4342
hosted runners to form a high availability setup. They both load balance, and
@@ -56,7 +55,7 @@ If you click on `llvm-premerge-cluster-us-central`, and go to the `Nodes` tab, y
5655
will see 3 node pools:
5756
- llvm-premerge-linux
5857
- llvm-premerge-linux-service
59-
- llvm-premerge-windows
58+
- llvm-premerge-windows-2022
6059
- llvm-premerge-libcxx
6160

6261
Definitions for each pool are in [Architecture overview](architecture.md).
@@ -96,11 +95,11 @@ To apply any changes to the cluster:
9695
```
9796
terraform apply -target module.premerge_cluster_us_central.google_container_node_pool.llvm_premerge_linux_service
9897
terraform apply -target module.premerge_cluster_us_central.google_container_node_pool.llvm_premerge_linux
99-
terraform apply -target module.premerge_cluster_us_central.google_container_node_pool.llvm_premerge_windows
98+
terraform apply -target module.premerge_cluster_us_central.google_container_node_pool.llvm_premerge_windows_2022
10099
terraform apply -target module.premerge_cluster_us_central.google_container_node_pool.llvm_premerge_libcxx
101100
terraform apply -target module.premerge_cluster_us_west.google_container_node_pool.llvm_premerge_linux_service
102101
terraform apply -target module.premerge_cluster_us_west.google_container_node_pool.llvm_premerge_linux
103-
terraform apply -target module.premerge_cluster_us_west.google_container_node_pool.llvm_premerge_windows
102+
terraform apply -target module.premerge_cluster_us_west.google_container_node_pool.llvm_premerge_windows_2022
104103
terraform apply -target module.premerge_cluster_us_west.google_container_node_pool.llvm_premerge_libcxx
105104
terraform apply
106105
```
@@ -147,7 +146,7 @@ on a kubernetes destroy command:
147146

148147
```bash
149148
terraform destroy -target module.premerge_cluster_us_central_resources.helm_release.github_actions_runner_set_linux
150-
terraform destroy -target module.premerge_cluster_us_central_resources.helm_release.github_actions_runner_set_windows
149+
terraform destroy -target module.premerge_cluster_us_central_resources.helm_release.github_actions_runner_set_windows_2022
151150
terraform destroy -target module.premerge_cluster_us_central_resources.helm_release.github_actions_runner_set_libcxx
152151
terraform destroy -target module.premerge_cluster_us_central_resources.helm_release.github_actions_runner_set_libcxx_release
153152
terraform destroy -target module.premerge_cluster_us_central_resources.helm_release.github_actions_runner_set_libcxx_next
@@ -162,7 +161,7 @@ commands by deleting the kubernetes namespaces all the resources live in:
162161

163162
```bash
164163
terraform destroy -target module.premerge_cluster_us_central_resources.kubernetes_namespace.llvm_premerge_linux_runners
165-
terraform destroy -target module.premerge_cluster_us_central_resources.kubernetes_namespace.llvm_premerge_windows_runners
164+
terraform destroy -target module.premerge_cluster_us_central_resources.kubernetes_namespace.llvm_premerge_windows_2022_runners
166165
terraform destroy -target module.premerge_cluster_us_central_resources.kubernetes_namespace.llvm_premerge_libcxx_runners
167166
terraform destroy -target module.premerge_cluster_us_central_resources.kubernetes_namespace.llvm_premerge_libcxx_release_runners
168167
terraform destroy -target module.premerge_cluster_us_central_resources.kubernetes_namespace.llvm_premerge_libcxx_next_runners

0 commit comments

Comments
 (0)