Skip to content

feat(ci): add Ubuntu 24.04 hydrophone canaries #1087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rico Lin (ricolin) wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(ci): add Ubuntu 24.04 hydrophone canaries #1087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92a64ad
feat(ci): add Ubuntu 24.04 hydrophone canaries
ricolin Jun 18, 2026
df31cf9
chore(ci): default hydrophone jobs to Ubuntu 24.04
ricolin Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devstack/local.conf.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ MANILA_SERVICE_IMAGE_ENABLED=True
MANILA_USE_UWSGI=False

enable_plugin magnum https://opendev.org/openstack/magnum
MAGNUM_GUEST_IMAGE_URL=https://static.atmosphere.dev/artifacts/magnum-cluster-api/ubuntu-jammy-kubernetes-1-31-1-1728920853.qcow2
MAGNUM_GUEST_IMAGE_URL=https://github.com/vexxhost/capo-image-elements/releases/latest/download/ubuntu-24.04-v1.36.1.qcow2

@mnaser Mohammed Naser (mnaser) Jun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be a pinned release, we can use hack/bump to update it with time, otherwise, it will break with time.


enable_plugin magnum-cluster-api https://github.com/vexxhost/magnum-cluster-api

Expand Down
9 changes: 5 additions & 4 deletions docs/developer/testing-and-development.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ steps to be able to test and develop the project.
```bash
pushd /tmp
source /opt/stack/openrc
export OS_DISTRO=ubuntu # you can change this to "flatcar" if you want to use Flatcar
for version in v1.24.16 v1.25.12 v1.26.7 v1.27.4; do \
[[ "${OS_DISTRO}" == "ubuntu" ]] && IMAGE_NAME="ubuntu-2204-kube-${version}" || IMAGE_NAME="flatcar-kube-${version}"; \
curl -LO https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/${IMAGE_NAME}.qcow2; \
export OS_DISTRO=ubuntu
export IMAGE_FAMILY=ubuntu-24.04
for version in v1.33.12 v1.34.8 v1.35.5 v1.36.1; do \
IMAGE_NAME="${IMAGE_FAMILY}-${version}"; \
curl -LO https://github.com/vexxhost/capo-image-elements/releases/latest/download/${IMAGE_NAME}.qcow2; \
openstack image create ${IMAGE_NAME} --disk-format=qcow2 --container-format=bare --property os_distro=${OS_DISTRO} --file=${IMAGE_NAME}.qcow2; \
openstack coe cluster template create \
--image $(openstack image show ${IMAGE_NAME} -c id -f value) \
Expand Down
9 changes: 5 additions & 4 deletions docs/user/getting-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ dashboard, Terraform, Ansible or the Magnum API directly.
them using the OpenStack CLI:

```bash
export OS_DISTRO=ubuntu # you can change this to "flatcar" if you want to use Flatcar
for version in v1.24.16 v1.25.12 v1.26.7 v1.27.4; do \
[[ "${OS_DISTRO}" == "ubuntu" ]] && IMAGE_NAME="ubuntu-2204-kube-${version}" || IMAGE_NAME="flatcar-kube-${version}"; \
curl -LO https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/${IMAGE_NAME}.qcow2; \
export OS_DISTRO=ubuntu
export IMAGE_FAMILY=ubuntu-24.04
for version in v1.33.12 v1.34.8 v1.35.5 v1.36.1; do \
IMAGE_NAME="${IMAGE_FAMILY}-${version}"; \
curl -LO https://github.com/vexxhost/capo-image-elements/releases/latest/download/${IMAGE_NAME}.qcow2; \
Comment on lines +50 to +54

@mnaser Mohammed Naser (mnaser) Jun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same issue here

openstack image create ${IMAGE_NAME} --disk-format=qcow2 --container-format=bare --property os_distro=${OS_DISTRO} --file=${IMAGE_NAME}.qcow2; \
openstack coe cluster template create \
--image $(openstack image show ${IMAGE_NAME} -c id -f value) \
Expand Down
6 changes: 4 additions & 2 deletions docs/user/images.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ The images used by the Cluster API driver for Magnum are built using the
project. This project provides a comprehensive and flexible framework for
constructing Kubernetes-specific images.

You can find pre-built images by this projet at
https://static.atmosphere.dev/artifacts/magnum-cluster-api/.
You can find pre-built images by this project in the
[`vexxhost/capo-image-elements` releases](https://github.com/vexxhost/capo-image-elements/releases).
For Ubuntu 24.04 images, use the `ubuntu-24.04-v<kubernetes-version>.qcow2`
assets and upload them to Glance with `--property os_distro=ubuntu`.

#### Deprecated legacy builder

Expand Down
82 changes: 77 additions & 5 deletions hack/bump/kubernetes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@

RELEASE_REPOSITORY = "vexxhost/capo-image-elements"
IMAGE_PREFIX = "ubuntu-22.04"
CANARY_IMAGE_PREFIXES = ("ubuntu-24.04",)

BASE_JOB_NAME = "magnum-cluster-api-hydrophone"
PROJECT_TEMPLATE_NAME = f"{BASE_JOB_NAME}-jobs"
VERSIONED_JOB_PREFIX = f"{BASE_JOB_NAME}-v"
NETWORK_DRIVERS = ("calico", "cilium")
IMAGE_URL = (
"https://github.com/vexxhost/capo-image-elements/releases/download/"
"{{ image_release }}/ubuntu-22.04-{{ kube_tag }}.qcow2"
"{{ image_release }}/{{ image_prefix }}-{{ kube_tag }}.qcow2"
)

KUBERNETES_IMAGE_RE = re.compile(r"^.+-v(?P<version>[0-9]+\.[0-9]+\.[0-9]+)\.qcow2$")
Expand All @@ -46,7 +47,9 @@ class ScriptError(RuntimeError):
class Release:
tag_name: str
name: str
image_prefix: str
versions: tuple[str, ...]
assets: tuple[str, ...]


class IndentedDumper(yaml.SafeDumper):
Expand Down Expand Up @@ -74,7 +77,9 @@ def latest_release(repository: str, image_prefix: str) -> Release:
return Release(
tag_name=tag_name,
name=release.name or tag_name,
image_prefix=image_prefix,
versions=versions_from_assets(tag_name, assets, image_prefix),
assets=tuple(assets),
)
except UnknownObjectException as exc:
raise ScriptError(
Expand Down Expand Up @@ -154,12 +159,21 @@ def hydrophone_jobs(release: Release) -> list[dict[str, Any]]:
for version in release.versions
for network_driver in NETWORK_DRIVERS
]
latest_version = release.versions[-1]
canary_prefixes = [
prefix for prefix in CANARY_IMAGE_PREFIXES if prefix != release.image_prefix
]
canary_jobs = [
f"{BASE_JOB_NAME}-{prefix}-v{latest_version}-{network_driver}"
for prefix in canary_prefixes
for network_driver in NETWORK_DRIVERS
]
jobs = [
{
"project-template": {
"name": PROJECT_TEMPLATE_NAME,
"check": {"jobs": list(generated_jobs)},
"gate": {"jobs": list(generated_jobs)},
"check": {"jobs": list(generated_jobs) + list(canary_jobs)},
"gate": {"jobs": list(generated_jobs) + list(canary_jobs)},
}
},
{
Expand All @@ -171,6 +185,7 @@ def hydrophone_jobs(release: Release) -> list[dict[str, Any]]:
"run": "zuul.d/playbooks/hydrophone/run.yml",
"post-run": "zuul.d/playbooks/hydrophone/post.yml",
"vars": {
"image_prefix": release.image_prefix,
"image_url": IMAGE_URL,
"devstack_localrc": {
"MAGNUM_GUEST_IMAGE_URL": "{{ image_url }}",
Expand Down Expand Up @@ -207,6 +222,44 @@ def hydrophone_jobs(release: Release) -> list[dict[str, Any]]:
}
)

for prefix in canary_prefixes:
canary_versions = set(
versions_from_assets(release.tag_name, list(release.assets), prefix)
)
if latest_version not in canary_versions:
raise ScriptError(
f"Release {release.tag_name} has no {prefix} image "
f"for v{latest_version}"
)

jobs.append(
{
"job": {
"name": f"{BASE_JOB_NAME}-{prefix}-v{latest_version}",
"parent": f"{VERSIONED_JOB_PREFIX}{latest_version}",
"vars": {
"image_prefix": prefix,
},
}
}
)

for network_driver in NETWORK_DRIVERS:
jobs.append(
{
"job": {
"name": (
f"{BASE_JOB_NAME}-{prefix}-v{latest_version}-"
f"{network_driver}"
),
"parent": f"{BASE_JOB_NAME}-{prefix}-v{latest_version}",
"vars": {
"network_driver": network_driver,
},
}
}
)

return jobs


Expand All @@ -232,7 +285,7 @@ def prune_jobs_text(text: str) -> str:
break

if name == BASE_JOB_NAME or (
name is not None and name.startswith(VERSIONED_JOB_PREFIX)
name is not None and name.startswith(f"{BASE_JOB_NAME}-")
):
continue
kept_blocks.append("".join(block))
Expand Down Expand Up @@ -316,7 +369,16 @@ def test_versions_from_assets_requires_prefix_for_every_release_version(
def test_hydrophone_jobs_include_template_base_release_and_network_jobs(
self,
) -> None:
release = Release("2026.05-7", "2026.05-7", ("1.33.12",))
release = Release(
tag_name="2026.05-7",
name="2026.05-7",
image_prefix="ubuntu-22.04",
versions=("1.33.12",),
assets=(
"ubuntu-22.04-v1.33.12.qcow2",
"ubuntu-24.04-v1.33.12.qcow2",
),
)
document = hydrophone_jobs(release)

template = document[0]["project-template"]
Expand All @@ -326,6 +388,8 @@ def test_hydrophone_jobs_include_template_base_release_and_network_jobs(
[
"magnum-cluster-api-hydrophone-v1.33.12-calico",
"magnum-cluster-api-hydrophone-v1.33.12-cilium",
"magnum-cluster-api-hydrophone-ubuntu-24.04-v1.33.12-calico",
"magnum-cluster-api-hydrophone-ubuntu-24.04-v1.33.12-cilium",
],
)
self.assertEqual(template["gate"]["jobs"], template["check"]["jobs"])
Expand All @@ -340,15 +404,21 @@ def test_hydrophone_jobs_include_template_base_release_and_network_jobs(

self.assertEqual(job_name(document[1]), BASE_JOB_NAME)
self.assertIn("{{ image_release }}", document[1]["job"]["vars"]["image_url"])
self.assertIn("{{ image_prefix }}", document[1]["job"]["vars"]["image_url"])
self.assertEqual(document[1]["job"]["vars"]["image_prefix"], "ubuntu-22.04")
self.assertEqual(
[job_name(entry) for entry in document[2:]],
[
"magnum-cluster-api-hydrophone-v1.33.12",
"magnum-cluster-api-hydrophone-v1.33.12-calico",
"magnum-cluster-api-hydrophone-v1.33.12-cilium",
"magnum-cluster-api-hydrophone-ubuntu-24.04-v1.33.12",
"magnum-cluster-api-hydrophone-ubuntu-24.04-v1.33.12-calico",
"magnum-cluster-api-hydrophone-ubuntu-24.04-v1.33.12-cilium",
],
)
self.assertEqual(document[2]["job"]["vars"]["image_release"], "2026.05-7")
self.assertEqual(document[5]["job"]["vars"]["image_prefix"], "ubuntu-24.04")

def test_prune_jobs_text_preserves_non_hydrophone_job_format(self) -> None:
text = dedent(
Expand All @@ -367,6 +437,8 @@ def test_prune_jobs_text_preserves_non_hydrophone_job_format(self) -> None:
name: magnum-cluster-api-hydrophone
- job:
name: magnum-cluster-api-hydrophone-v1.32.9
- job:
name: magnum-cluster-api-hydrophone-ubuntu-24.04-v1.32.9
"""
)
expected = dedent(
Expand Down
3 changes: 2 additions & 1 deletion zuul.d/hydrophone-jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
run: zuul.d/playbooks/hydrophone/run.yml
post-run: zuul.d/playbooks/hydrophone/post.yml
vars:
image_url: https://github.com/vexxhost/capo-image-elements/releases/download/{{ image_release }}/ubuntu-22.04-{{ kube_tag }}.qcow2
image_prefix: ubuntu-24.04
image_url: https://github.com/vexxhost/capo-image-elements/releases/download/{{ image_release }}/{{ image_prefix }}-{{ kube_tag }}.qcow2
devstack_localrc:
MAGNUM_GUEST_IMAGE_URL: '{{ image_url }}'
- job:
Expand Down
Loading