diff --git a/hardening/container/anaconda-ostree/main.fmf b/hardening/container/anaconda-ostree/main.fmf index f34691b..e7c9519 100644 --- a/hardening/container/anaconda-ostree/main.fmf +++ b/hardening/container/anaconda-ostree/main.fmf @@ -28,9 +28,6 @@ adjust: - when: distro < rhel-9.6 enabled: false because: Image Mode not supported for older RHELs - - when: distro == rhel - enabled: false - because: TODO - no freely accessible RHEL bootc image, CentOS Stream only tag+: # TODO: this test is currently broken by / blocked on Anaconda # having broken ostreecontainer kickstart functionality, diff --git a/hardening/container/anaconda-ostree/test.py b/hardening/container/anaconda-ostree/test.py index c56d62e..8b8b258 100755 --- a/hardening/container/anaconda-ostree/test.py +++ b/hardening/container/anaconda-ostree/test.py @@ -16,8 +16,13 @@ guest.wipe() guest.generate_ssh_keypair() -# CentOS Stream image only, for now -src_image = f'quay.io/centos-bootc/centos-bootc:stream{versions.rhel.major}' +# select appropriate container image based on host OS +major = versions.rhel.major +minor = versions.rhel.minor +if versions.rhel.is_true_rhel(): + src_image = f'images.paas.redhat.com/testingfarm/rhel-bootc:{major}.{minor}' +else: + src_image = f'quay.io/centos-bootc/centos-bootc:stream{major}' # RHEL-9 and older use 'maint-1.3' openscap git repo branch, newer use 'main' if versions.rhel <= 9: diff --git a/hardening/container/bootc-image-builder/main.fmf b/hardening/container/bootc-image-builder/main.fmf index 4bea20b..fe6549b 100644 --- a/hardening/container/bootc-image-builder/main.fmf +++ b/hardening/container/bootc-image-builder/main.fmf @@ -28,9 +28,6 @@ adjust: - when: distro < rhel-9.6 enabled: false because: Image Mode not supported for older RHELs - - when: distro == rhel - enabled: false - because: TODO - no freely accessible RHEL bootc image, CentOS Stream only /anssi_bp28_high: diff --git a/hardening/container/bootc-image-builder/test.py b/hardening/container/bootc-image-builder/test.py index 958eeef..f1110b1 100755 --- a/hardening/container/bootc-image-builder/test.py +++ b/hardening/container/bootc-image-builder/test.py @@ -19,8 +19,13 @@ guest.wipe() guest.generate_ssh_keypair() -# CentOS Stream image only, for now -src_image = f'quay.io/centos-bootc/centos-bootc:stream{versions.rhel.major}' +# select appropriate container image based on host OS +major = versions.rhel.major +minor = versions.rhel.minor +if versions.rhel.is_true_rhel(): + src_image = f'images.paas.redhat.com/testingfarm/rhel-bootc:{major}.{minor}' +else: + src_image = f'quay.io/centos-bootc/centos-bootc:stream{major}' # RHEL-9 and older use 'maint-1.3' openscap git repo branch, newer use 'main' if versions.rhel <= 9: