Skip tests working only on upstream/RHGS accordingly (#1209)

* Marked tests working only on upstream/RHGS

Signed-off-by: nik-redhat <[email protected]>

* Fix skip check

Signed-off-by: nik-redhat <[email protected]>

Author: nik-redhat

common/ops/support_ops/machine_ops.py

@@ -428,14 +428,15 @@ def check_hardware_requirements(self, servers: list = None,
                     raise Exception(f"The test case requires {bricks_count}"
                                     " bricks per node to run the test")
 
-    def check_rhgs_installation(self, servers: list):
+    def check_gluster_installation(self, servers: list, inst_type: str):
         """
-        Method to check if the RHGS is installed on the servers
+        Method to check if the type of gluster installation on the servers
+        That is upstream/downstream.
 
         Args:
             servers (list): List of server nodes
 
-        NOTE: This might not be the best way to check for RHGS, but it works
+        NOTE: This might not be the best way to check, but it works
               for now
         """
         if not isinstance(servers, list):
@@ -445,15 +446,25 @@ def check_rhgs_installation(self, servers: list):
         cmd = "rpm -qa | grep 'gluster' | grep '6\.0-'"
         ret = self.execute_command_multinode(cmd, servers)
         for each_ret in ret:
-            if each_ret['error_code'] != 0:
+            if inst_type == "upstream" and each_ret['error_code'] == 0:
+                self.TEST_RES[0] = None
+                raise Exception("The test case requires Upstream "
+                                "installation")
+
+            elif inst_type == "downstream" and each_ret['error_code'] != 0:
                 self.TEST_RES[0] = None
                 raise Exception("The test case requires RHGS Installation")
 
         # Check for RHEL env
         cmd = "rpm -qa | grep 'gluster' | grep '\.el'"
         ret = self.execute_command_multinode(cmd, servers)
         for each_ret in ret:
-            if each_ret['error_code'] != 0:
+            if inst_type == "upstream" and each_ret['error_code'] == 0:
+                self.TEST_RES[0] = None
+                raise Exception("The test case requires Upstream "
+                                "installation")
+
+            elif inst_type == "downstream" and each_ret['error_code'] != 0:
                 self.TEST_RES[0] = None
                 raise Exception("The test case requires RHGS Installation")
 

config/config.yml

@@ -77,8 +77,6 @@ excluded_tests:
     - tests/functional/arbiter/test_self_heal_50k_files.py # Taking a lot of time, needs to be debugged
     - tests/functional/arbiter/test_self_heal_50k_files_heal_command_by_add_brick.py # Same as above
     - tests/functional/arbiter/test_create_snapshot_and_verify_content.py # Excluded in RHGS CI test
-    - tests/functional/glusterd/test_localtime_logging_and_opversion_negative_case.py # localtime-logging option not available in RHGS
-    - tests/functional/glusterd/test_rebalance_start_not_failed_with_socket_path_too_long.py # Doesn't work on RHGS installation
     - tests/functional/glusterd/test_glusterd_selinux.py # Issue with SELinux in CI
     - tests/functional/glusterd/test_glusterd_memory_consumption_increase.py # Memory consumption not consistent
     - tests/functional/glusterd/test_shared_storage.py # Fails in CI, because of a known issue with shared_storage mounting after reboot in env having ipv6 enabled

tests/functional/arbiter/test_create_snapshot_and_verify_content.py

@@ -35,7 +35,7 @@ def setup_test(self):
         """
         # Check for RHGS installation, as snapshot restore throws
         # error in upstream devel code
-        self.redant.check_rhgs_installation(self.server_list)
+        self.redant.check_gluster_installation(self.server_list, "downstream")
 
         conf_hash = deepcopy(self.vol_type_inf[self.volume_type])
         self.redant.setup_volume(self.vol_name, self.server_list[0],

tests/functional/dht/test_add_brick_rebalance_with_self_heal_in_progress.py

@@ -35,7 +35,7 @@ def setup_test(self):
         self.is_copy_running = False
 
         # Skip test if not RHGS installation
-        self.redant.check_rhgs_installation(self.server_list)
+        self.redant.check_gluster_installation(self.server_list, "downstream")
 
         self.redant.setup_volume(self.vol_name, self.server_list[0],
                                  self.vol_type_inf[self.volume_type],

tests/functional/dht/test_rebalance_add_brick_and_lookup.py

@@ -32,7 +32,7 @@ def setup_test(self):
         Override the volume create, start and mount in parent_run_test
         """
         # Run TC only on RHGS installation
-        self.redant.check_rhgs_installation(self.server_list)
+        self.redant.check_gluster_installation(self.server_list, "downstream")
 
         conf_hash = self.vol_type_inf[self.volume_type]
         self.redant.setup_volume(self.vol_name, self.server_list[0],

tests/functional/dht/test_wipe_out_directory_permissions.py

@@ -30,7 +30,7 @@ def setup_test(self):
         Override the volume create, start and mount in parent_run_test
         """
         # Skip test if not RHGS installation
-        self.redant.check_rhgs_installation(self.server_list)
+        self.redant.check_gluster_installation(self.server_list, "downstream")
 
         conf_hash = deepcopy(self.vol_type_inf[self.volume_type])
         conf_hash['dist_count'] = 1

tests/functional/glusterd/test_default_ping_timer_and_epoll_thread_count.py

@@ -37,10 +37,11 @@ def run_test(self, redant):
         5. Fetch the pid of glusterd
         6. Check epoll thread count of glusterd should be 1
         """
+        # Skip if not RHGS installation
+        redant.check_gluster_installation(self.server_list, "downstream")
+
         # Fetch the ping timeout value from glusterd.vol file
-        # TODO: this path might change as per the installation
-        cmd = "cat /etc/glusterfs/glusterd.vol |\
-               grep -i ping-timeout"
+        cmd = "cat /etc/glusterfs/glusterd.vol | grep -i ping-timeout"
 
         ret = redant.execute_command(cmd, self.server_list[0])
         out = ret['msg'][0]

tests/functional/glusterd/test_glusterd_friend_updates_on_node_rejoin.py

@@ -36,6 +36,9 @@ def run_test(self, redant):
            glusterd was running
         3. Check friend updates between rejoined node to each other node
         """
+        # Skip if not RHGS installation
+        redant.check_gluster_installation(self.server_list, "downstream")
+
         # Restart glusterd on one of the node
         redant.restart_glusterd(self.server_list[0])
 

tests/functional/glusterd/test_localtime_logging_and_opversion_negative_case.py

@@ -25,6 +25,19 @@
 
 class TestCase(DParentTest):
 
+    @DParentTest.setup_custom_enable
+    def setup_test(self):
+        """
+        Override the volume create, start and mount in parent_run_test
+        """
+        # Skip if RHGS installation
+        self.redant.check_gluster_installation(self.server_list, "upstream")
+
+        conf_hash = self.vol_type_inf[self.volume_type]
+        self.redant.setup_volume(self.vol_name, self.server_list[0],
+                                 conf_hash, self.server_list,
+                                 self.brick_roots)
+
     def _logging_time_check(self):
         """
         Check if the logging is done in localtime

tests/functional/glusterd/test_rebalance_start_not_failed_with_socket_path_too_long.py

@@ -54,6 +54,9 @@ def run_test(self, redant):
         6. Perform add-brick for disperse volume 6 bricks
         7. Start rebalance of disperse volume
         """
+        # Skip if RHGS installation
+        self.redant.check_gluster_installation(self.server_list, "upstream")
+
         cmd = ("sed -i 's/end-volume/option transport.socket.bind-address"
                f" {self.server_list[0]}\\n&/g' /etc/glusterfs/glusterd.vol")
 

tests/functional/glusterd/test_setting_volume_option_with_more_than_4096_characters.py

@@ -32,7 +32,7 @@ def setup_test(self):
         Override the volume create, start and mount in parent_run_test
         """
         # Skip test if not RHGS installation
-        self.redant.check_rhgs_installation(self.server_list)
+        self.redant.check_gluster_installation(self.server_list, "downstream")
 
         self.redant.setup_volume(self.vol_name, self.server_list[0],
                                  self.vol_type_inf[self.volume_type],

tests/functional/snapshot/test_snapshot_create.py

@@ -36,7 +36,7 @@ def setup_test(self):
         self.validate_io_procs = False
 
         # Skip test if not RHGS installation
-        self.redant.check_rhgs_installation(self.server_list)
+        self.redant.check_gluster_installation(self.server_list, "downstream")
 
         self.redant.setup_volume(self.vol_name, self.server_list[0],
                                  self.vol_type_inf[self.volume_type],

tests/functional/snapshot/test_validate_snap_del_gd_down.py

@@ -35,7 +35,7 @@ def setup_test(self):
         Override the volume create, start in parent_run_test
         """
         # Skip test if not RHGS installation
-        self.redant.check_rhgs_installation(self.server_list)
+        self.redant.check_gluster_installation(self.server_list, "downstream")
 
         self.redant.setup_volume(self.vol_name, self.server_list[0],
                                  self.vol_type_inf[self.volume_type],