Skip to content

Commit 2818105

Browse files
committed
Added CC revocation list path to integration test
Added revocation list path and kernel cmdline arguments to meet the needs for CC. The path names are still artificial as we need to find a way how to provide them in OBS.
1 parent a34bcfe commit 2818105

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

build-tests/s390/tumbleweed/test-image-MicroOS/appliance.kiwi

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
luks_pbkdf="pbkdf2"
2525
luks_version="luks2"
2626
filesystem="btrfs"
27-
kernelcmdline="systemd.show_status=yes console=ttyS0,115200 console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=qemu"
27+
kernelcmdline="systemd.show_status=yes console=ttyS0,115200 console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=qemu swiotlb=262144"
2828
devicepersistency="by-uuid"
2929
btrfs_root_is_snapshot="true"
3030
btrfs_root_is_readonly_snapshot="true"
@@ -42,14 +42,12 @@
4242
<oem-unattended>true</oem-unattended>
4343
<oem-resize>true</oem-resize>
4444
</oemconfig>
45-
<bootloader name="zipl" s390_hkd_cert="/path/to/HKD-8561-02688E8.crt" s390_hkd_ca_cert="/path/to/DigiCertCA.crt" s390_hkd_sign_cert="/path/to/ibm-z-host-key-signing.crt" timeout="10"/>
45+
<bootloader name="zipl" s390_hkd_cert="/path/to/HKD-8561-02688E8.crt" s390_hkd_ca_cert="/path/to/DigiCertCA.crt" s390_hkd_sign_cert="/path/to/ibm-z-host-key-signing.crt" s390_hkd_revocation_list="/path/to/revocation-list.crl" timeout="10"/>
4646
<systemdisk>
4747
<volume name="home"/>
4848
<volume name="root"/>
4949
<volume name="opt"/>
5050
<volume name="srv"/>
51-
<!--<volume name="boot/grub2/i386-pc"/>-->
52-
<!--<volume name="boot/grub2/x86_64-efi" mountpoint="boot/grub2/x86_64-efi"/>-->
5351
<volume name="boot/writable"/>
5452
<volume name="usr/local"/>
5553
<volume name="var" copy_on_write="false"/>
@@ -64,7 +62,7 @@
6462
luks_pbkdf="pbkdf2"
6563
luks_version="luks2"
6664
filesystem="btrfs"
67-
kernelcmdline="systemd.show_status=yes console=ttyS0,115200 console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=dasd dasd_mod.dasd=ipldev"
65+
kernelcmdline="systemd.show_status=yes console=ttyS0,115200 console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=dasd dasd_mod.dasd=ipldev swiotlb=262144"
6866
target_blocksize="4096"
6967
devicepersistency="by-uuid"
7068
btrfs_root_is_snapshot="true"
@@ -82,7 +80,7 @@
8280
<oem-unattended>true</oem-unattended>
8381
<oem-resize>true</oem-resize>
8482
</oemconfig>
85-
<bootloader name="zipl" targettype="CDL" s390_hkd_cert="/path/to/HKD-8561-02688E8.crt" s390_hkd_ca_cert="/path/to/DigiCertCA.crt" s390_hkd_sign_cert="/path/to/ibm-z-host-key-signing.crt" timeout="10"/>
83+
<bootloader name="zipl" targettype="CDL" s390_hkd_cert="/path/to/HKD-8561-02688E8.crt" s390_hkd_ca_cert="/path/to/DigiCertCA.crt" s390_hkd_sign_cert="/path/to/ibm-z-host-key-signing.crt" s390_hkd_revocation_list="/path/to/revocation-list.crl" timeout="10"/>
8684
<systemdisk>
8785
<volume name="home"/>
8886
<volume name="root"/>

0 commit comments

Comments
 (0)