Skip to content

Commit aa0c4f7

Browse files
committed
Add selinux test build to TW
Also update derived docker integration test to latest Leap
1 parent 231c3db commit aa0c4f7

File tree

3 files changed

+101
-2
lines changed

3 files changed

+101
-2
lines changed

build-tests/x86/leap/test-image-docker-derived/appliance.kiwi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<specification>SUSE derived docker container</specification>
88
</description>
99
<preferences>
10-
<type image="docker" derived_from="obs://openSUSE:Containers:Leap:15.3/containers/opensuse/leap#15.3">
10+
<type image="docker" derived_from="obs://openSUSE:Containers:Leap:15.6/containers/opensuse/leap#15.6">
1111
<containerconfig name="builder" tag="1.0" additionalnames=":latest"/>
1212
</type>
13-
<version>1.15.3</version>
13+
<version>1.15.6</version>
1414
<packagemanager>zypper</packagemanager>
1515
<rpm-excludedocs>true</rpm-excludedocs>
1616
</preferences>
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<image schemaversion="7.5" name="kiwi-test-image-disk-selinux" displayname="Selinux">
4+
<description type="system">
5+
<author>Marcus Schäfer</author>
6+
<contact>[email protected]</contact>
7+
<specification>Simple selinux disk, devel policy</specification>
8+
</description>
9+
<preferences>
10+
<version>1.15.4</version>
11+
<packagemanager>zypper</packagemanager>
12+
<locale>en_US</locale>
13+
<keytable>us</keytable>
14+
<timezone>Europe/Berlin</timezone>
15+
<rpm-excludedocs>true</rpm-excludedocs>
16+
<rpm-check-signatures>false</rpm-check-signatures>
17+
<bootsplash-theme>bgrt</bootsplash-theme>
18+
<bootloader-theme>openSUSE</bootloader-theme>
19+
<type image="oem" filesystem="xfs" kernelcmdline="console=ttyS0 security=selinux selinux=1 enforcing=1" firmware="uefi" format="qcow2">
20+
<oemconfig>
21+
<oem-resize>false</oem-resize>
22+
</oemconfig>
23+
<bootloader name="grub2" console="serial" timeout="10"/>
24+
</type>
25+
</preferences>
26+
<users>
27+
<user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
28+
</users>
29+
<repository type="rpm-md">
30+
<source path="obsrepositories:/"/>
31+
</repository>
32+
<packages type="image">
33+
<package name="patterns-base-minimal_base"/>
34+
<package name="restorecond"/>
35+
<package name="policycoreutils"/>
36+
<package name="setools-console"/>
37+
<package name="selinux-policy-targeted"/>
38+
<package name="selinux-policy-devel"/>
39+
<package name="selinux-autorelabel"/>
40+
<package name="bind-utils"/>
41+
<package name="systemd"/>
42+
<package name="plymouth-theme-bgrt"/>
43+
<package name="grub2-branding-openSUSE"/>
44+
<package name="iputils"/>
45+
<package name="vim"/>
46+
<package name="grub2"/>
47+
<package name="grub2-x86_64-efi" arch="x86_64"/>
48+
<package name="grub2-i386-pc"/>
49+
<package name="lvm2"/>
50+
<package name="plymouth"/>
51+
<package name="fontconfig"/>
52+
<package name="fonts-config"/>
53+
<package name="tar"/>
54+
<package name="parted"/>
55+
<package name="openssh"/>
56+
<package name="iproute2"/>
57+
<package name="less"/>
58+
<package name="bash-completion"/>
59+
<package name="dhcp-client"/>
60+
<package name="which"/>
61+
<package name="kernel-default"/>
62+
<package name="shim"/>
63+
<package name="timezone"/>
64+
</packages>
65+
<packages type="bootstrap">
66+
<package name="udev"/>
67+
<package name="filesystem"/>
68+
<package name="glibc-locale"/>
69+
<package name="cracklib-dict-full"/>
70+
<package name="ca-certificates"/>
71+
<package name="ca-certificates-mozilla"/>
72+
<package name="openSUSE-release"/>
73+
</packages>
74+
</image>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/sh
2+
# shellcheck disable=SC1091
3+
test -f /.kconfig && . /.kconfig
4+
5+
set -ex
6+
7+
#======================================
8+
# Setup baseproduct link
9+
#--------------------------------------
10+
suseSetupProduct
11+
12+
#======================================
13+
# Delete auto relabel trigger
14+
#--------------------------------------
15+
rm -f /.autorelabel
16+
17+
#======================================
18+
# Activate services
19+
#--------------------------------------
20+
suseInsertService sshd
21+
22+
#======================================
23+
# Setup default target, multi-user
24+
#--------------------------------------
25+
baseSetRunlevel 3

0 commit comments

Comments
 (0)