Skip to content

Commit

Permalink
Update to image-builder 1.30
Browse files Browse the repository at this point in the history
This fixes issues #378 and #384 and allows the daily build
ubuntu ISO to be used again to build images.
  • Loading branch information
Jonathan Rosser committed Jun 17, 2024
1 parent 4fed389 commit 7bedf19
Showing 1 changed file with 19 additions and 22 deletions.
41 changes: 19 additions & 22 deletions magnum_cluster_api/cmd/image_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def validate_version(_, __, value):
@click.option(
"--image-builder-version",
show_default=True,
default="v0.1.29",
default="v0.1.30",
help="Image builder tag (or commit) to use for building image",
)
@click.option(
Expand Down Expand Up @@ -166,28 +166,25 @@ def main(

# NOTE(mnaser): We use the latest tested daily ISO for Ubuntu 22.04 in order
# to avoid a lengthy upgrade process.
if operating_system == "ubuntu-2204":
iso = "jammy-live-server-amd64.iso"

# NOTE(jrosser): This can be uncommented again when
# https://github.com/vexxhost/magnum-cluster-api/issues/378 is fixed
# if operating_system == "ubuntu-2204":
# iso = "jammy-live-server-amd64.iso"
#
# customization["iso_url"] = (
# f"http://cdimage.ubuntu.com/ubuntu-server/jammy/daily-live/current/{iso}"
# )
#
# # Get the SHA256 sum for the ISO
# r = requests.get(
# "http://cdimage.ubuntu.com/ubuntu-server/jammy/daily-live/current/SHA256SUMS"
# )
# r.raise_for_status()
# for line in r.text.splitlines():
# if iso in line:
# customization["iso_checksum"] = line.split()[0]
# break
#
# # Assert that we have the checksum
# assert "iso_checksum" in customization
customization["iso_url"] = (
f"http://cdimage.ubuntu.com/ubuntu-server/jammy/daily-live/current/{iso}"
)

# Get the SHA256 sum for the ISO
r = requests.get(
"http://cdimage.ubuntu.com/ubuntu-server/jammy/daily-live/current/SHA256SUMS"
)
r.raise_for_status()
for line in r.text.splitlines():
if iso in line:
customization["iso_checksum"] = line.split()[0]
break

# Assert that we have the checksum
assert "iso_checksum" in customization

if operating_system == "rockylinux-8":
iso = "Rocky-x86_64-minimal.iso"
Expand Down

0 comments on commit 7bedf19

Please sign in to comment.