Skip to content

Commit 88f6478

Browse files
authored
[tests] bump ubuntu to 24.04 jammy (#2721)
1 parent d3f9104 commit 88f6478

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

docs/developers-guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Choose the one you are familiar with and easy to customize. Config the cluster w
4343
Using kubeadm, openstack-cloud-controller-manager can be deployed easily with predefined manifests, see the [deployment guide with kubeadm](openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md#deploy-a-kubernetes-cluster-with-openstack-cloud-controller-manager-using-kubeadm).
4444

4545
### DevStack-based testing environment
46-
You can also use our CI scripts to setup a simple development environment based on DevStack and k3s. To do so you need a fresh VM with Ubuntu 22.04. We've tested this with 4 vCPUs and 16 GB of RAM and that's recommended, but we never tested the lower bound, so feel free to try with less resources.
46+
You can also use our CI scripts to setup a simple development environment based on DevStack and k3s. To do so you need a fresh VM with Ubuntu 24.04. We've tested this with 4 vCPUs and 16 GB of RAM and that's recommended, but we never tested the lower bound, so feel free to try with less resources.
4747

4848
Once the VM is up make sure your SSH keys allow logging in as `ubuntu` user and from your PC and cloud-provider-openstack directory run:
4949

@@ -133,11 +133,11 @@ make unit
133133

134134
End-to-end or _e2e_ tests are more complex to run as they require a functioning OpenStack cloud and Kubernetes (well, k3s) deployment. Fortunately, you can rely on the infrastructure used for CI to run this on your own machines.
135135

136-
For example, to run the Cinder CSI e2e tests, the CI calls the `tests/ci-csi-cinder-e2e.sh` script. Inspecting this, you'll note that a lot of the commands in here are simply provisioning an instance on GCE, using [Boskos](https://github.com/kubernetes-sigs/boskos) to manage static resources (projects, in this case) if needed. If you have a set of GCE credentials, then in theory you could run this script as-is. However, all you need is a VM with sufficient resources and network connectivity running the correct image (Ubuntu 20.04 cloud image as of writing - check `tests/scripts/create-gce-vm.sh` for the latest info). For example, using OpenStack:
136+
For example, to run the Cinder CSI e2e tests, the CI calls the `tests/ci-csi-cinder-e2e.sh` script. Inspecting this, you'll note that a lot of the commands in here are simply provisioning an instance on GCE, using [Boskos](https://github.com/kubernetes-sigs/boskos) to manage static resources (projects, in this case) if needed. If you have a set of GCE credentials, then in theory you could run this script as-is. However, all you need is a VM with sufficient resources and network connectivity running the correct image (Ubuntu 24.04 cloud image as of writing - check `tests/scripts/create-gce-vm.sh` for the latest info). For example, using OpenStack:
137137

138138
```
139139
openstack server create \
140-
--image ubuntu2004 \
140+
--image ubuntu2404 \
141141
--flavor m1.large \
142142
--key-name <key-name> \
143143
--network <network> \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
docker_version: 5:20.10.18~3-0~ubuntu-focal
2+
docker_version: 5:27.3.1-1~ubuntu.24.04~noble
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
k3s_release: v1.31.0+k3s1
2+
k3s_release: v1.31.2+k3s1
33
worker_node_count: 1
44
cluster_token: "K1039d1cf76d1f8b0e8b0d48e7c60d9c4a43c2e7a56de5d86f346f2288a2677f1d7::server:2acba4e60918c0e2d1f1d1a7c4e81e7b"
55
devstack_workdir: "{{ ansible_user_dir }}/devstack"
66
flavor_name: "ds2G"
77
sg_name: "k3s_sg"
88
keypair_name: "k3s_keypair"
9-
image_url: "https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.img"
10-
image_name: "ubuntu-jammy"
9+
image_url: "https://cloud-images.ubuntu.com/releases/noble/release/ubuntu-24.04-server-cloudimg-amd64.img"
10+
image_name: "ubuntu-noble"
1111
master_port_name: "k3s_master"

tests/scripts/create-gce-vm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ main() {
9494
if ! gcloud compute disks describe devstack-${FLAVOR} --zone "${GCP_ZONE}" > /dev/null 2>&1;
9595
then
9696
gcloud compute disks create devstack-${FLAVOR} \
97-
--image-project ubuntu-os-cloud --image-family ubuntu-2204-lts \
97+
--image-project ubuntu-os-cloud --image-family ubuntu-2404-lts-amd64 \
9898
--zone "${GCP_ZONE}"
9999
fi
100100

0 commit comments

Comments
 (0)