Enable vhd on more releases

Signed-off-by: chunfuwen <[email protected]>
autotest · Jan 8, 2025 · b2754af · b2754af
1 parent bec99d8
commit b2754af
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/provider/bootc_image_builder/bootc_image_build_utils.py b/provider/bootc_image_builder/bootc_image_build_utils.py
@@ -407,7 +407,7 @@ def create_config_toml_file(params):
                       "rootpw --lock --iscrypted locked\n"
                       "sshkey --username %s \"%s\"\ntext --non-interactive\nzerombr\n"
                       "clearpart --all --initlabel --disklabel=gpt\nautopart --noswap --type=lvm\n"
-                      "network --bootproto=dhcp --device=eno1 --activate --onboot=on\n reboot" % (username, password, username, key_value)
+                      "network --bootproto=dhcp --device=link --activate --onboot=on\n reboot" % (username, password, username, key_value)
                       }
         if params.get("fips_enable") == "yes":
             fips_content = f"""

diff --git a/virttools/tests/cfg/bootc_image_builder/bootc_disk_image_build.cfg b/virttools/tests/cfg/bootc_image_builder/bootc_disk_image_build.cfg
@@ -44,7 +44,7 @@
 				    local_container = "yes"
 			- centos10:
 			    container_url = "quay.io/centos-bootc/centos-bootc:stream10"
-			    only upstream_bib..use_config_json..tls_verify_enable, rhel_9.5_nightly_bib..use_config_json..tls_verify_enable, rhel_9.6_nightly_bib..use_config_json..tls_verify_enable, rhel_9.4_nightly_bib..use_config_json..tls_verify_enable
+			    only upstream_bib..use_config_json..tls_verify_enable, rhel_10.0_bib..use_config_json..tls_verify_enable, rhel_9.6_nightly_bib..use_config_json..tls_verify_enable, rhel_9.4_nightly_bib..use_config_json..tls_verify_enable
 			    roofs = "xfs"
 			    rhel_9.4_nightly_bib..use_config_json..tls_verify_enable:
 			        roofs = ""
@@ -220,10 +220,10 @@
             output_sub_folder = "vpc"
             output_name = "disk.vhd"
             no s390-virtio
-            only upstream_bib, rhel_9.5_nightly_bib
+            only upstream_bib, rhel_9.6_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.5_nightly_bib
+            only upstream_bib, rhel_9.6_nightly_bib, rhel_10.0_bib
diff --git a/virttools/tests/cfg/bootc_image_builder/bootc_disk_image_install.cfg b/virttools/tests/cfg/bootc_image_builder/bootc_disk_image_install.cfg
@@ -40,7 +40,7 @@
 			- centos10:
 			    container_url = "quay.io/centos-bootc/centos-bootc:stream10"
 			    only efi
-			    only upstream_bib, rhel_9.5_nightly_bib, rhel_9.6_nightly_bib, rhel_9.4_nightly_bib
+			    only upstream_bib, rhel_10.0_bib, rhel_9.6_nightly_bib, rhel_9.4_nightly_bib
 			    roofs = "ext4"
 			    rhel_9.4_nightly_bib:
 			        roofs = ""
@@ -228,10 +228,10 @@
             output_sub_folder = "vpc"
             output_name = "disk.vhd"
             no s390-virtio
-            only upstream_bib, rhel_9.5_nightly_bib
+            only upstream_bib, rhel_9.6_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.5_nightly_bib
+            only upstream_bib, rhel_9.6_nightly_bib, rhel_10.0_bib