Merge pull request #4325 from ggiguash/enable_bootc_selinux

openshift-merge-bot[bot] · web-flow · commit 6c1c9453781d · 2024-12-17T18:56:50.000Z
USHIFT-2911: Enable SELinux tests on bootc CentOS 9 Stream
diff --git a/test/scenarios-bootc/periodics/el95-crel@published-images-standard1.sh b/test/scenarios-bootc/periodics/el95-crel@published-images-standard1.sh
@@ -51,6 +51,6 @@ scenario_run_tests() {
         exit 0
     fi
     run_tests host1 suites/standard1/
-    # When SELinux is working on bootc systems add following suite:
+    # When SELinux is working on RHEL 9.6 bootc systems add following suite:
     # suites/selinux/validate-selinux-policy.robot
 }
diff --git a/test/scenarios-bootc/presubmits/cos9-src@standard-suite1.sh b/test/scenarios-bootc/presubmits/cos9-src@standard-suite1.sh
@@ -12,7 +12,5 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    run_tests host1 suites/standard1/
-    # When SELinux is working on bootc systems add following suite:
-    # suites/selinux/validate-selinux-policy.robot
+    run_tests host1 suites/standard1/ suites/selinux/validate-selinux-policy.robot
 }
diff --git a/test/scenarios-bootc/presubmits/el95-src@standard-suite1.sh b/test/scenarios-bootc/presubmits/el95-src@standard-suite1.sh
@@ -13,6 +13,6 @@ scenario_remove_vms() {
 
 scenario_run_tests() {
     run_tests host1 suites/standard1/
-    # When SELinux is working on bootc systems add following suite:
+    # When SELinux is working on RHEL 9.6 bootc systems add following suite:
     # suites/selinux/validate-selinux-policy.robot
 }

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,6 @@ scenario_run_tests() {`
`51`	`51`	`exit 0`
`52`	`52`	`fi`
`53`	`53`	`run_tests host1 suites/standard1/`
`54`		`- # When SELinux is working on bootc systems add following suite:`
	`54`	`+ # When SELinux is working on RHEL 9.6 bootc systems add following suite:`
`55`	`55`	`# suites/selinux/validate-selinux-policy.robot`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,5 @@ scenario_remove_vms() {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`scenario_run_tests() {`
`15`		`- run_tests host1 suites/standard1/`
`16`		`- # When SELinux is working on bootc systems add following suite:`
`17`		`- # suites/selinux/validate-selinux-policy.robot`
	`15`	`+ run_tests host1 suites/standard1/ suites/selinux/validate-selinux-policy.robot`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ scenario_remove_vms() {`
`13`	`13`
`14`	`14`	`scenario_run_tests() {`
`15`	`15`	`run_tests host1 suites/standard1/`
`16`		`- # When SELinux is working on bootc systems add following suite:`
	`16`	`+ # When SELinux is working on RHEL 9.6 bootc systems add following suite:`
`17`	`17`	`# suites/selinux/validate-selinux-policy.robot`
`18`	`18`	`}`