Skip to content

Enable bootc image builder on rhel9.7 and rhel10.1 #6320

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+53 −8
Open

Enable bootc image builder on rhel9.7 and rhel10.1 #6320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions provider/bootc_image_builder/bootc_image_build_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,9 @@ def create_and_build_container_file(params):
if "rhel-9.6" in custom_repo:
repo_path = pathlib.Path(folder) / "rhel-9.6.repo"
repo_prefix = "rhel-9.6"
if "rhel-9.7" in custom_repo:
repo_path = pathlib.Path(folder) / "rhel-9.7.repo"
repo_prefix = "rhel-9.7"
if "rhel-10.0" in custom_repo:
repo_path = pathlib.Path(folder) / "rhel-10.0.repo"
repo_prefix = "rhel-10.0"
Expand Down
23 changes: 21 additions & 2 deletions virttools/tests/cfg/bootc_image_builder/bootc_disk_image_build.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
anaconda-iso..upstream_bib..fedora_40:
kickstart = "yes"
use_toml_config = "yes"
anaconda-iso..rhel_9.5_nightly_bib..local_image, anaconda-iso..rhel_9.6_nightly_bib..local_image:
anaconda-iso..rhel_9.6_nightly_bib..local_image, anaconda-iso..rhel_9.7_nightly_bib..local_image:
kickstart = "yes"
filesystem_size_set = "yes"
- unuse_config_json:
Expand Down Expand Up @@ -77,8 +77,10 @@
build_container = "registry.stage.redhat.io/rhel9/rhel-bootc:rhel-9.4"
rhel_9.5_nightly_bib:
build_container = "registry.stage.redhat.io/rhel9/rhel-bootc:9.5"
rhel_9.6_nightly_bib, upstream_bib:
rhel_9.6_nightly_bib:
build_container = "registry.stage.redhat.io/rhel9/rhel-bootc:9.6"
rhel_9.7_nightly_bib, upstream_bib:
build_container = "registry.stage.redhat.io/rhel9/rhel-bootc:9.7"
rhel_10.0_bib:
build_container = "registry.stage.redhat.io/rhel10/rhel-bootc:10.0"
- rhel_9.4:
Expand All @@ -101,6 +103,13 @@
only rhel_9.6_nightly_bib
redhat_version_id = "9.6"
no anaconda-iso
- rhel_9.7_nightly:
container_url = "registry.stage.redhat.io/rhel9/rhel-bootc:9.7"
only rhel_9.7_nightly_bib
qcow..rhel_9.7_nightly_bib:
enable_lvm_disk_partitions = "yes"
redhat_version_id = "9.7"
no anaconda-iso
- rhel_10.0_nightly:
container_url = "registry.stage.redhat.io/rhel10/rhel-bootc:10.0"
enable_tls_verify = "false"
Expand Down Expand Up @@ -178,6 +187,16 @@
anaconda-iso..local_image:
custom_repo = "rhel-9.6.repo"
compose_url = "example_compose_url"
- rhel_9.7_nightly_bib:
registry_stage_key = "example_stage_key"
redhat_stage_registry = "registry.stage.redhat.io"
bib_image_url = "registry.stage.redhat.io/rhel9/bootc-image-builder:9.7"
key_store_mounted = "/etc/pki:/etc/pki"
podman_stage_username = "11009103|stage"
podman_stage_password = "example_stage_password"
anaconda-iso..local_image:
custom_repo = "rhel-9.7.repo"
compose_url = "example_compose_url"
- rhel_10.0_bib:
registry_stage_key = "example_stage_key"
redhat_stage_registry = "registry.stage.redhat.io"
Expand Down
29 changes: 25 additions & 4 deletions virttools/tests/cfg/bootc_image_builder/bootc_disk_image_install.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
- centos10:
container_url = "quay.io/centos-bootc/centos-bootc:stream10"
only efi
only upstream_bib, rhel_10.0_bib, rhel_9.6_nightly_bib, rhel_9.4_nightly_bib
only upstream_bib, rhel_10.0_bib, rhel_9.7_nightly_bib
roofs = "ext4"
rhel_9.4_nightly_bib:
roofs = ""
Expand Down Expand Up @@ -82,10 +82,14 @@
build_container = "registry.stage.redhat.io/rhel9/rhel-bootc:9.5"
fips_enable = "yes"
enable_fips_enable_repo = "yes"
rhel_9.6_nightly_bib, upstream_bib:
rhel_9.6_nightly_bib:
build_container = "registry.stage.redhat.io/rhel9/rhel-bootc:9.6"
fips_enable = "yes"
enable_fips_enable_repo = "yes"
rhel_9.7_nightly_bib, upstream_bib:
build_container = "registry.stage.redhat.io/rhel9/rhel-bootc:9.7"
fips_enable = "yes"
enable_fips_enable_repo = "yes"
anaconda-iso..upstream_bib, anaconda-iso..rhel_9.5_nightly_bib:
fips_enable = "yes"
use_toml_config = "yes"
Expand All @@ -107,6 +111,11 @@
enable_tls_verify = "false"
only rhel_9.6_nightly_bib
no anaconda-iso
- rhel_9.7_nightly:
container_url = "registry.stage.redhat.io/rhel9/rhel-bootc:9.7"
enable_tls_verify = "false"
only rhel_9.7_nightly_bib
no anaconda-iso
- rhel_10.0_nightly:
container_url = "registry.stage.redhat.io/rhel10/rhel-bootc:10.0"
enable_tls_verify = "false"
Expand Down Expand Up @@ -171,6 +180,16 @@
anaconda-iso..local_image:
custom_repo = "rhel-9.6.repo"
compose_url = "example_compose_url"
- rhel_9.7_nightly_bib:
registry_stage_key = "example_stage_key"
redhat_stage_registry = "registry.stage.redhat.io"
bib_image_url = "registry.stage.redhat.io/rhel9/bootc-image-builder:9.7"
key_store_mounted = "/etc/pki:/etc/pki"
podman_stage_username = "11009103|stage"
podman_stage_password = "example_stage_password"
anaconda-iso..local_image:
custom_repo = "rhel-9.7.repo"
compose_url = "example_compose_url"
- rhel_10.0_bib:
registry_stage_key = "example_stage_key"
redhat_stage_registry = "registry.stage.redhat.io"
Expand Down Expand Up @@ -201,6 +220,8 @@
aws_config_dict = {}
rhel_9.6_nightly_bib..centos.centos9, rhel_9.6_nightly_bib..local_image:
aws_config_dict = {}
rhel_9.7_nightly_bib..centos.centos9, rhel_9.7_nightly_bib..local_image:
aws_config_dict = {}
upstream_bib..centos, upstream_bib..local_image, upstream_bib..fedora.fedora_40:
aws_config_dict = {}
- qcow:
Expand Down Expand Up @@ -230,10 +251,10 @@
output_sub_folder = "vpc"
output_name = "disk.vhd"
no s390-virtio
only upstream_bib, rhel_9.6_nightly_bib, rhel_10.0_bib
only upstream_bib, rhel_9.7_nightly_bib, rhel_10.0_bib
- gce:
disk_image_type = "gce"
output_sub_folder = "gce"
output_name = "image.tar.gz"
no s390-virtio
only upstream_bib, rhel_9.6_nightly_bib, rhel_10.0_bib
only upstream_bib, rhel_9.7_nightly_bib, rhel_10.0_bib
3 changes: 2 additions & 1 deletion virttools/tests/src/bootc_image_builder/bootc_disk_image_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ def prepare_env_and_execute_bib(params, test):
if disk_image_type in ["ami"]:
bib_utils.prepare_aws_env(params)

if bib_ref in ["upstream_bib", "rhel_9.4_nightly_bib", "rhel_9.5_nightly_bib", "rhel_9.6_nightly_bib", "rhel_10.0_bib"]:
if bib_ref in ["upstream_bib", "rhel_9.4_nightly_bib", "rhel_9.5_nightly_bib",
"rhel_9.6_nightly_bib", "rhel_9.7_nightly_bib", "rhel_10.0_bib"]:
auth_file = bib_utils.create_auth_json_file(params)
bib_utils.podman_login_with_auth(auth_file, params.get("redhat_stage_registry"))
options = " -v %s:/run/containers/0/auth.json " % auth_file
Expand Down
3 changes: 2 additions & 1 deletion virttools/tests/src/bootc_image_builder/bootc_disk_image_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ def prepare_env_and_execute_bib(params, test):
if disk_image_type in ["ami"]:
bib_utils.prepare_aws_env(params)

if bib_ref in ["upstream_bib", "rhel_9.4_nightly_bib", "rhel_9.5_nightly_bib", "rhel_9.6_nightly_bib", "rhel_10.0_bib"]:
if bib_ref in ["upstream_bib", "rhel_9.4_nightly_bib", "rhel_9.5_nightly_bib",
"rhel_9.6_nightly_bib", "rhel_9.7_nightly_bib", "rhel_10.0_bib"]:
auth_file = bib_utils.create_auth_json_file(params)
bib_utils.podman_login_with_auth(auth_file, params.get("redhat_stage_registry"))
options = " -v %s:/run/containers/0/auth.json " % auth_file
Expand Down