Merge pull request #6211 from ggiguash/host-network-bootc-builds

USHIFT-6517: Use host network for bootc image builds for proxy access

Author: openshift-merge-bot[bot]

test/bin/common.sh

@@ -187,7 +187,7 @@ get_vm_bridge_ip() {
 VM_BRIDGE_IP="$(get_vm_bridge_ip "default")"
 
 # Web server port number
-WEB_SERVER_PORT=8080
+export WEB_SERVER_PORT=8080
 
 # Web server URL using VM bridge IP with fallback to host name
 # shellcheck disable=SC2034  # used elsewhere

test/bin/pyutils/build_bootc_images.py

@@ -284,11 +284,15 @@ def should_skip(image, cached):
             # Note:
             # - The pull secret is necessary in some builds for pulling embedded
             #   container images referenced in release-info RPMs
+            # - The host network usage is required to access the RPM repository
+            #   proxy server using the localhost URL to make generated builds
+            #   reusable from cache on other hosts.
             # - The explicit push-to-mirror sets the 'latest' tag as all the build
             #   layers are in the mirror due to 'cache-to' option
             build_args = [
                 "sudo", "podman", "build",
                 "--authfile", PULL_SECRET,
+                "--network", "host",
                 "--secret", f"id=pullsecret,src={PULL_SECRET}",
                 "--cache-to", f"{MIRROR_REGISTRY}/{cf_outname}",
                 "--cache-from", f"{MIRROR_REGISTRY}/{cf_outname}",
@@ -373,7 +377,8 @@ def should_skip(file):
             # cached but not fetched from the mirror registry.
             pull_args = [
                 "sudo", "podman", "pull",
-                "--authfile", PULL_SECRET, bf_imgref
+                "--authfile", PULL_SECRET,
+                bf_imgref
             ]
             start = time.time()
             common.retry_on_exception(3, common.run_command_in_shell, pull_args, dry_run, logfile, logfile)
@@ -384,6 +389,7 @@ def should_skip(file):
             build_args = [
                 "sudo", "podman", "run",
                 "--rm", "-i", "--privileged",
+                "--network", "host",
                 "--pull=newer",
                 "--security-opt", "label=type:unconfined_t",
                 "-v", f"{bf_outdir}:/output",

test/package-sources-bootc/rhel98-mirror.repo

@@ -1,15 +1,15 @@
 [rhel-9.8-appstream]
 name = rhel-9.8-appstream
 
-baseurl = {{ .Env.WEB_SERVER_URL }}/ocp-mirror/reposync/4.22{{ if eq .Env.UNAME_M "aarch64" }}_aarch64{{ end }}/rhel-98-appstream
+baseurl = http://localhost:{{ .Env.WEB_SERVER_PORT }}/ocp-mirror/reposync/4.22{{ if eq .Env.UNAME_M "aarch64" }}_aarch64{{ end }}/rhel-98-appstream
 enabled = 1
 sslverify = false
 gpgcheck = 0
 skip_if_unavailable = false
 
 [rhel-9.8-baseos]
 name = rhel-9.8-baseos
-baseurl = {{ .Env.WEB_SERVER_URL }}/ocp-mirror/reposync/4.22{{ if eq .Env.UNAME_M "aarch64" }}_aarch64{{ end }}/rhel-98-baseos
+baseurl = http://localhost:{{ .Env.WEB_SERVER_PORT }}/ocp-mirror/reposync/4.22{{ if eq .Env.UNAME_M "aarch64" }}_aarch64{{ end }}/rhel-98-baseos
 enabled = 1
 sslverify = false
 gpgcheck = 0