Skip to content

Commit 4c3246b

Browse files
sarthakagsarthakag
authored
Remove all references to ubuntu20.04 (GoogleCloudPlatform#4963)
2 parents 2d37cdc + ca43a22 commit 4c3246b

20 files changed

Lines changed: 34 additions & 52 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ The Cluster Toolkit officially supports the following VM images:
119119

120120
* HPC Rocky Linux 8
121121
* Debian 11
122-
* Ubuntu 20.04 LTS
122+
* Ubuntu 22.04 LTS
123123

124124
For more information on these and other images, see
125125
[docs/vm-images.md](docs/vm-images.md).

community/examples/hpc-slurm-ubuntu2004.yaml renamed to community/examples/hpc-slurm-ubuntu2204.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
---
1616

17-
blueprint_name: hpc-slurm-ubuntu2004-v6
17+
blueprint_name: hpc-slurm-ubuntu2204-v6
1818

1919
vars:
2020
project_id: ## Set GCP Project ID Here ##

‎docs/vm-images.md‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* [Cluster Toolkit Supported Images](#cluster-toolkit-supported-images)
77
* [HPC Rocky Linux 8](#hpc-rocky-linux-8)
88
* [Debian 11](#debian-11)
9-
* [Ubuntu 20.04 LTS](#ubuntu-2004-lts)
9+
* [Ubuntu 22.04 LTS](#ubuntu-2204-lts)
1010
* [Windows](#windows)
1111
* [Other Images](#other-images)
1212
* [Slurm on GCP](#slurm-on-gcp)
@@ -75,7 +75,7 @@ blueprint:
7575
project: debian-cloud
7676
7777
instance_image:
78-
family: ubuntu-2004-lts
78+
family: ubuntu-2204-lts
7979
project: ubuntu-os-cloud
8080
```
8181

@@ -114,9 +114,9 @@ HPC Rocky Linux 8 is the primary supported VM image for HPC workloads on Google
114114
The Cluster Toolkit officially supports Debian 11 based VM images in the majority of
115115
our modules, with a couple of exceptions.
116116

117-
### Ubuntu 20.04 LTS
117+
### Ubuntu 22.04 LTS
118118

119-
The Cluster Toolkit officially supports Ubuntu 20.04 LTS based VM images in the
119+
The Cluster Toolkit officially supports Ubuntu 22.04 LTS based VM images in the
120120
majority of our modules, with a couple of exceptions.
121121

122122
### Windows
@@ -131,7 +131,7 @@ description of our support for Windows images.
131131
<th>Deployment Type/Scheduler</th>
132132
<th>Feature</th>
133133
<th></th>
134-
<th>Debian 11</th><th>Rocky Linux 8</th><th>Ubuntu 20.04</th>
134+
<th>Debian 11</th><th>Rocky Linux 8</th><th>Ubuntu 22.04</th>
135135
</tr>
136136
<tr>
137137
<td></td><td></td><td></td><td></td><td></td><td></td>
@@ -173,7 +173,7 @@ description of our support for Windows images.
173173
<td></td>
174174
<td>✓</td>
175175
<td><a href="../examples/hpc-slurm.yaml">✓</a></td>
176-
<td><a href="../community/examples/hpc-slurm-ubuntu2004.yaml">✓</a></td>
176+
<td><a href="../community/examples/hpc-slurm-ubuntu2204.yaml">✓</a></td>
177177
</tr>
178178
<tr>
179179
<th>Startup script</th>
@@ -190,7 +190,7 @@ description of our support for Windows images.
190190
<th></th>
191191
<td><a href="../tools/validate_configs/os_compatibility_tests/vm-crd.yaml">✓</a></td>
192192
<td></td>
193-
<td><sup><b>*</b></sup></td>
193+
<td><a href="../tools/validate_configs/os_compatibility_tests/vm-crd.yaml">✓</a></td>
194194
</tr>
195195
<tr>
196196
<th>Lustre</th>
@@ -223,8 +223,6 @@ description of our support for Windows images.
223223
</tr>
224224
</table>
225225

226-
<sup><b>*</b></sup> Chrome Remote desktop does not support Ubuntu 20.04, but it does support Ubuntu 22.04.
227-
228226
### Other Images
229227

230228
The Cluster Toolkit strives to provide flexibility wherever possible. It is possible
@@ -284,7 +282,7 @@ These instructions apply to the following modules:
284282
[batch-job]: ../modules/scheduler/batch-job-template
285283
[batch-login]: ../modules/scheduler/batch-login-node
286284
[htcondor-setup]: ../community/modules/scheduler/htcondor-setup
287-
[hpc-slurm-ubuntu2004.yaml]: ../community/examples/hpc-slurm-ubuntu2004.yaml
285+
[hpc-slurm-ubuntu2204.yaml]: ../community/examples/hpc-slurm-ubuntu2204.yaml
288286

289287
[htc-htcondor.yaml]: ../community/examples/htc-htcondor.yaml
290288
[vm-startup.yaml]: ../tools/validate_configs/os_compatibility_tests/vm-startup.yaml

‎examples/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ md_toc github examples/README.md | sed -e "s/\s-\s/ * /"
3333
* [ps-slurm.yaml](#ps-slurmyaml--) ![core-badge] ![experimental-badge]
3434
* [cae-slurm.yaml](#cae-slurmyaml-) ![core-badge]
3535
* [hpc-build-slurm-image.yaml](#hpc-build-slurm-imageyaml--) ![community-badge] ![experimental-badge]
36-
* [hpc-slurm-ubuntu2004.yaml](#hpc-slurm-ubuntu2004yaml--) ![community-badge]
36+
* [hpc-slurm-ubuntu2204.yaml](#hpc-slurm-ubuntu2204yaml--) ![community-badge]
3737
* [hpc-amd-slurm.yaml](#hpc-amd-slurmyaml-) ![community-badge]
3838
* [hpc-slurm-sharedvpc.yaml](#hpc-slurm-sharedvpcyaml--) ![community-badge] ![experimental-badge]
3939
* [client-google-cloud-storage.yaml](#client-google-cloud-storageyaml--) ![community-badge] ![experimental-badge]
@@ -872,9 +872,9 @@ The blueprint contains 3 groups:
872872

873873
[hpc-build-slurm-image.yaml]: ../community/examples/hpc-build-slurm-image.yaml
874874

875-
### [hpc-slurm-ubuntu2004.yaml] ![community-badge]
875+
### [hpc-slurm-ubuntu2204.yaml] ![community-badge]
876876

877-
Similar to the [hpc-slurm.yaml] example, but using Ubuntu 20.04 instead of CentOS 7.
877+
Similar to the [hpc-slurm.yaml] example, but using Ubuntu 22.04 instead of CentOS 7.
878878
[Other operating systems] are supported by SchedMD for the the Slurm on GCP project and images are listed [here](https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#published-image-family). Only the examples listed in this page been tested by the Cluster Toolkit team.
879879

880880
The cluster will support 2 partitions named `debug` and `compute`.
@@ -885,9 +885,9 @@ partition runs on compute optimized nodes of type `cs-standard-60`. The
885885
`compute` partition may require additional quota before using.
886886

887887
[Other operating systems]: https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#supported-operating-systems
888-
[hpc-slurm-ubuntu2004.yaml]: ../community/examples/hpc-slurm-ubuntu2004.yaml
888+
[hpc-slurm-ubuntu2204.yaml]: ../community/examples/hpc-slurm-ubuntu2204.yaml
889889

890-
#### Quota Requirements for hpc-slurm-ubuntu2004.yaml
890+
#### Quota Requirements for hpc-slurm-ubuntu2204.yaml
891891

892892
For this example the following is needed in the selected region:
893893

‎modules/file-system/managed-lustre/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Toolkit, see the extended [Network Storage documentation](../../../docs/network_
1010
### Supported Operating Systems
1111

1212
A Managed Lustre instance can be used with Slurm cluster or compute
13-
VM running Ubuntu 20.04, 22.04 or Rocky Linux 8 (including the HPC flavor).
13+
VM running Ubuntu 22.04 or Rocky Linux 8 (including the HPC flavor).
1414

1515
### Managed Lustre Access
1616

‎modules/file-system/managed-lustre/scripts/install-managed-lustre-client.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Install Managed Lustre client modules
1717
# Based on these instructions: https://cloud.google.com/managed-lustre/docs/connect-from-compute-engine
1818

19-
# The client modules currently only support Rocky 8, and Ubuntu 20.04/22.04
19+
# The client modules currently only support Rocky 8, and Ubuntu 22.04
2020

2121
set -e
2222

@@ -40,7 +40,7 @@ fi
4040
. /etc/os-release
4141
DIST="NA"
4242
if [[ $NAME == *"Ubuntu"* ]]; then
43-
if [[ $VERSION_ID == "20.04" || $VERSION_ID == "22.04" ]]; then
43+
if [[ $VERSION_ID == "22.04" ]]; then
4444
DIST="Ubuntu"
4545
fi
4646
elif [[ $NAME == *"Rocky"* ]]; then

‎modules/file-system/pre-existing-network-storage/README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ The following is an example of using `pre-existing-network-storage` with the
7575
```
7676

7777
This is similar to the `lustre` filesystem, with the exception that it connects
78-
with a managed Lustre instance hosted by GCP. Currently only Rocky 8 and
79-
Ubuntu 20.04 and Ubuntu 22.04 are supported.
78+
with a managed Lustre instance hosted by GCP. Currently only Rocky 8 and Ubuntu 22.04 are supported.
8079

8180
The following is an example of using `pre-existing-network-storage` with the `daos`
8281
filesystem. In order to use existing `parallelstore` instance, `fs_type` needs to be

‎modules/file-system/pre-existing-network-storage/scripts/install-managed-lustre-client.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Install Managed Lustre client modules
1717
# Based on these instructions: https://cloud.google.com/managed-lustre/docs/connect-from-compute-engine
1818

19-
# The client modules currently only support Rocky 8, and Ubuntu 20.04/22.04
19+
# The client modules currently only support Rocky 8, and Ubuntu 22.04
2020

2121
set -e
2222

@@ -40,7 +40,7 @@ fi
4040
. /etc/os-release
4141
DIST="NA"
4242
if [[ $NAME == *"Ubuntu"* ]]; then
43-
if [[ $VERSION_ID == "20.04" || $VERSION_ID == "22.04" ]]; then
43+
if [[ $VERSION_ID == "22.04" ]]; then
4444
DIST="Ubuntu"
4545
fi
4646
elif [[ $NAME == *"Rocky"* ]]; then

‎tools/cloud-build/daily-tests/blueprints/ansible-vm.yaml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,6 @@ deployment_groups:
4444
set -ex
4545
echo \$(ansible --version)
4646
47-
- id: startup-script-u20
48-
# this source line is deliberate; it is the last to support Ubuntu 20.04
49-
# Ubuntu 20.04 coverage may be removed when the a3-highgpu-8g solution is
50-
# refactored to use Ubuntu 22.04 or later
51-
source: github.com/GoogleCloudPlatform/cluster-toolkit//modules/scripts/startup-script?ref=v1.51.1&depth=1
52-
settings:
53-
install_ansible: true
54-
runners:
55-
- type: shell
56-
destination: startup.sh
57-
content: |
58-
#!/bin/bash
59-
set -ex
60-
echo \$(ansible --version)
61-
6247
- id: workstation-ubuntu-2204
6348
source: modules/compute/vm-instance
6449
use:

‎tools/cloud-build/daily-tests/blueprints/lustre-slurm.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ deployment_groups:
7070
# Slurm VMs #
7171
#############
7272

73-
# # Ubuntu 20.04 LTS
73+
# # Ubuntu 22.04 LTS
7474
# - id: ubuntu_nodeset
7575
# source: community/modules/compute/schedmd-slurm-gcp-v6-nodeset
7676
# use: [network]

0 commit comments

Comments
 (0)