Merge pull request #508 from zhaohuijuan/dev

Update case test_check_hostkey_permissions to adapt the bootc scenario
virt-s1 · Jan 14, 2025 · 5a34ae2 · 5a34ae2
2 parents 11f3b87 + f5e9eb3
commit 5a34ae2
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/os_tests/tests/test_cloud_init.py b/os_tests/tests/test_cloud_init.py
@@ -1317,9 +1317,14 @@ def test_check_hostkey_permissions(self):
         if 'ssh_keys' in group_ssh_keys:
             for key in private_keys:
                 if len(key) == 0:
-                    continue            
-                self.assertIn('-rw-r-----. root ssh_keys', key,
+                    continue
+                ssh_ver = utils_lib.run_cmd(self, "rpm -q openssh | awk -F'-' '{print $2}' | awk -F'p' '{print $1}'")
+                if float(ssh_ver) > 9:
+                    self.assertIn('-rw-------. root ssh_keys', key,
                         msg=" Unexpected permissions -> %s" % key)
+                else:
+                    self.assertIn('-rw-r-----. root ssh_keys', key,
+                            msg=" Unexpected permissions -> %s" % key)
         else:
             for key in private_keys:
                 if len(key) == 0: