Fix nonroot tests

Signed-off-by: L. Pivarc <[email protected]>

pkg/host-disk/host-disk.go

@@ -141,7 +141,7 @@ func shouldSkipVolumeSource(passthoughFSVolumes map[string]struct{}, hotplugVolu
 
 	volumeStatus, ok := pvcVolume[volumeName]
 	if !ok || types.IsPVCBlock(volumeStatus.PersistentVolumeClaimInfo.VolumeMode) {
-
+		log.Log.V(4).Infof("this volume %s is block, will not be replaced by HostDisk", volumeName)
 		// This is not a disk on a file system, so skip it.
 		return true
 	}

tests/migration_test.go

@@ -1753,15 +1753,20 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:[email protected]][level:system
 		Context("[Serial] migration to nonroot", func() {
 			var dv *cdiv1.DataVolume
 			size := "256Mi"
+			var clusterIsRoot bool
 
 			BeforeEach(func() {
-				if !checks.HasFeature(virtconfig.NonRoot) {
-					Skip("Test specific to NonRoot featureGate that is not enabled")
+				clusterIsRoot = checks.HasFeature(virtconfig.Root)
+				if !clusterIsRoot {
+					tests.EnableFeatureGate(virtconfig.Root)
 				}
-				tests.DisableFeatureGate(virtconfig.NonRoot)
 			})
 			AfterEach(func() {
-				tests.EnableFeatureGate(virtconfig.NonRoot)
+				if !clusterIsRoot {
+					tests.DisableFeatureGate(virtconfig.Root)
+				} else {
+					tests.EnableFeatureGate(virtconfig.Root)
+				}
 				libstorage.DeleteDataVolume(&dv)
 			})
 
@@ -1779,7 +1784,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:[email protected]][level:system
 				By("Checking that the launcher is running as root")
 				Expect(tests.GetIdOfLauncher(vmi)).To(Equal("0"))
 
-				tests.EnableFeatureGate(virtconfig.NonRoot)
+				tests.DisableFeatureGate(virtconfig.Root)
 
 				By("Starting new migration and waiting for it to succeed")
 				migration := tests.NewRandomMigration(vmi.Name, vmi.Namespace)
@@ -1833,16 +1838,16 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:[email protected]][level:system
 			size := "256Mi"
 
 			BeforeEach(func() {
-				clusterIsRoot = !checks.HasFeature(virtconfig.NonRoot)
+				clusterIsRoot = checks.HasFeature(virtconfig.Root)
 				if clusterIsRoot {
-					tests.EnableFeatureGate(virtconfig.NonRoot)
+					tests.DisableFeatureGate(virtconfig.Root)
 				}
 			})
 			AfterEach(func() {
 				if clusterIsRoot {
-					tests.DisableFeatureGate(virtconfig.NonRoot)
+					tests.EnableFeatureGate(virtconfig.Root)
 				} else {
-					tests.EnableFeatureGate(virtconfig.NonRoot)
+					tests.DisableFeatureGate(virtconfig.Root)
 				}
 				if dv != nil {
 					libstorage.DeleteDataVolume(&dv)
@@ -1864,7 +1869,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:[email protected]][level:system
 				By("Checking that the launcher is running as root")
 				Expect(tests.GetIdOfLauncher(vmi)).To(Equal("107"))
 
-				tests.DisableFeatureGate(virtconfig.NonRoot)
+				tests.EnableFeatureGate(virtconfig.Root)
 
 				By("Starting new migration and waiting for it to succeed")
 				migration := tests.NewRandomMigration(vmi.Name, vmi.Namespace)

tests/security_features_test.go

@@ -246,7 +246,7 @@ var _ = Describe("[Serial][sig-compute]SecurityFeatures", func() {
 				}
 			}
 			caps := *container.SecurityContext.Capabilities
-			if checks.HasFeature(virtconfig.NonRoot) {
+			if !checks.HasFeature(virtconfig.Root) {
 				Expect(caps.Add).To(HaveLen(2), fmt.Sprintf("Found capabilities %s, expected NET_BIND_SERVICE and SYS_PTRACE", caps.Add))
 				Expect(caps.Add).To(ContainElements(k8sv1.Capability("NET_BIND_SERVICE"), k8sv1.Capability("SYS_PTRACE")))
 			} else {

tests/utils.go

@@ -1504,7 +1504,7 @@ func CreateHostDiskImage(diskPath string) *k8sv1.Pod {
 	dir := filepath.Dir(diskPath)
 
 	command := fmt.Sprintf(`dd if=/dev/zero of=%s bs=1 count=0 seek=1G && ls -l %s`, diskPath, dir)
-	if checks.HasFeature(virtconfig.NonRoot) {
+	if !checks.HasFeature(virtconfig.Root) {
 		command = command + fmt.Sprintf(" && chown 107:107 %s", diskPath)
 	}