Skip to content

Commit 4eb9ca0

Browse files
committed
test migration branch
1 parent e73df2c commit 4eb9ca0

File tree

2 files changed

+42
-6
lines changed

2 files changed

+42
-6
lines changed

schedule/security/selinux.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,21 @@ name: selinux
22
description: >
33
This is for SElinux test
44
schedule:
5+
# - microos/disk_boot
6+
# - transactional/host_config
7+
# - update/zypper_clear_repos
8+
# - console/zypper_ar
9+
# - console/zypper_ref
10+
# - transactional/enable_selinux
11+
# - microos/services_enabled
512
- '{{bootloader_zkvm}}'
613
- '{{sle_os_boot}}'
714
- '{{alp_boot}}'
815
- '{{scc_slem}}'
916
- security/selinux/selinux_setup
1017
- security/selinux/sestatus
1118
- '{{sle_os_tests}}'
19+
# - security/selinux/selinux_migration
1220
- security/selinux/semanage_fcontext
1321
- security/selinux/semanage_boolean
1422
- security/selinux/fixfiles
@@ -22,7 +30,8 @@ schedule:
2230
- security/selinux/set_get_enforce
2331
- security/selinux/selinuxexeccon
2432
- security/selinux/setroubleshootd
25-
- '{{alp_shutdown}}'
33+
- security/selinux/selinux_migration
34+
# - '{{alp_shutdown}}'
2635
conditional_schedule:
2736
bootloader_zkvm:
2837
ARCH:

tests/security/selinux/selinux_migration.pm

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ use testapi;
1212
use serial_terminal 'select_serial_terminal';
1313
use utils;
1414
use version_utils qw(is_sle is_microos is_leap is_tumbleweed is_sle_micro has_selinux);
15+
use version_utils qw(is_sle is_sle_micro is_transactional package_version_cmp);
16+
use transactional;
1517
use transactional qw(process_reboot trup_call);
1618
use Utils::Architectures;
1719

@@ -23,11 +25,24 @@ sub run {
2325
check_dir();
2426

2527
my $rollback_number = create_snapshot();
28+
#TODO update test repo
29+
#zypper_call('ar https://download.opensuse.org/repositories/home:/djz88:/branches:/security:/SELinux/openSUSE_Factory/ selinux-migration');
30+
zypper_call('ar https://download.opensuse.org/repositories/home:/cahu:/branches:/security:/SELinux:/varlibselinux-fixes/openSUSE_Factory/ selinux-migration');
31+
record_info('Updating SELinux policy package.');
32+
zypper_call("--gpg-auto-import-keys ref");
33+
if(is_microos){
34+
enter_trup_shell(global_options => '-c') if is_transactional;
35+
script_run('zypper in -i selinux-migration trasnactional-update', 600);
36+
exit_trup_shell if is_transactional;
37+
process_reboot(trigger => 1);
2638

27-
if (script_run("zypper info selinux-policy | grep -q 'out-of-date'")) {
28-
29-
update_selinux_policy();
3039
}
40+
#script_run("mkdir -p /var/lib/selinux");
41+
42+
# if (script_run("zypper info selinux-policy | grep -q 'out-of-date'")) {
43+
44+
update_selinux_policy();
45+
#}
3146

3247

3348
check_paths();
@@ -109,10 +124,21 @@ sub create_snapshot {
109124
sub update_selinux_policy {
110125
record_info('Updating SELinux policy');
111126
zypper_call("--gpg-auto-import-keys ref");
127+
script_run("zypper info selinux-policy");
112128
if (is_microos) {
113129
validate_script_output('sestatus', sub { m/SELinux status: .*enabled/ && m/Current mode: .*enforcing/ }, fail_message => 'SELinux is NOT enabled and set to enforcing');
114-
trup_call('dup', timeout => 600);
130+
131+
enter_trup_shell(global_options => '-c') if is_transactional;
132+
script_run('zypper dup --force-resolution --allow-vendor-change --no-confirm', 600);
133+
script_run('zypper in -r selinux-migration --force-resolution --allow-vendor-change --no-confirm selinux-policy selinux-policy-targeted selinux-policy-targeted-gaming policycoreutils policycoreutils-python-utils setools-console systemd-presets-common-SUSE', 600);
134+
exit_trup_shell if is_transactional;
135+
136+
137+
# trup_call 'dup', timeout => 600;
138+
#trup_call('dup', timeout => 600);
115139
process_reboot(trigger => 1);
140+
script_run("zypper lr -u");
141+
script_run("zypper info selinux-policy");
116142
}
117143
else {
118144
zypper_call('dup --force-resolution --allow-vendor-change --no-confirm');
@@ -167,7 +193,7 @@ sub rollback_and_verify_state {
167193
record_info("test1 has correct selinux label");
168194
}
169195
else {
170-
record_info("wrong selinux label", result => "fail");
196+
record_info("[FAIL]","Wrong selinux label", result => "fail");
171197
}
172198

173199

@@ -221,6 +247,7 @@ sub check_dir {
221247
sub check_service {
222248
if (script_run("systemctl list-unit-files --type=service | grep -qw cleanoldsepoldir.service") == 0) {
223249
my $status = script_output("systemctl is-enabled cleanoldsepoldir.service");
250+
print $status;
224251
return $status;
225252
} else {
226253
record_info("[FAIL]", "cleanoldsepoldir.service not detected", result => "fail");

0 commit comments

Comments
 (0)