database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

chore(ci): remove sudo usage from systemctl calls in cmapi tests

Browse Source
This commit is contained in:
aleksei.bukhalov
2025-06-02 12:52:37 +02:00
committed by Aleksei Bukhalov
parent 8bffbda465
commit 3de8af2fa4
4 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/prepare_test_stage.sh
View File

@@ -11,10 +11,10 @@ source "$SCRIPT_LOCATION"/utils.sh
echo "Arguments received: $@" echo "Arguments received: $@"
optparse.define short=c long=container-name desc="Name of the Docker container to run tests in" variable=CONTAINER_NAME optparse.define short=c long=container-name desc="Name of the Docker container to run tests in" variable=CONTAINER_NAME
optparse.define short=i long=docker-image desc="Docker image name to start container from" variable=DOCKER_IMAGE optparse.define short=i long=docker-image desc="Docker image name to start container from" variable=DOCKER_IMAGE
optparse.define short=r long=result-path desc="Name suffix used in core dump file path" variable=RESULT optparse.define short=r long=result-path desc="Name suffix used in core dump file path" variable=RESULT
optparse.define short=s long=do-setup desc="Run setup-repo.sh inside the container" variable=DO_SETUP optparse.define short=s long=do-setup desc="Run setup-repo.sh inside the container" variable=DO_SETUP
optparse.define short=u long=packages-url desc="Packages url" variable=PACKAGES_URL optparse.define short=u long=packages-url desc="Packages url" variable=PACKAGES_URL
source $(optparse.build) source $(optparse.build)
if [[ "$EUID" -ne 0 ]]; then if [[ "$EUID" -ne 0 ]]; then
@@ -104,7 +104,6 @@ fi
# install deps # install deps
if [[ "$RESULT" == *rocky* ]]; then if [[ "$RESULT" == *rocky* ]]; then
# sudo bypass
execInnerDockerWithRetry "$CONTAINER_NAME" 'yum update -y && yum install -y cracklib-dicts diffutils elfutils epel-release findutils iproute gawk gcc-c++ gdb hostname lz4 patch perl procps-ng rsyslog sudo tar wget which' execInnerDockerWithRetry "$CONTAINER_NAME" 'yum update -y && yum install -y cracklib-dicts diffutils elfutils epel-release findutils iproute gawk gcc-c++ gdb hostname lz4 patch perl procps-ng rsyslog sudo tar wget which'
else else
change_ubuntu_mirror_in_docker "$CONTAINER_NAME" "us" change_ubuntu_mirror_in_docker "$CONTAINER_NAME" "us"

8
cmapi/cmapi_server/test/test_cluster.py
View File

@@ -29,14 +29,14 @@ class BaseClusterTestCase(BaseServerTestCase):
def tearDownClass(cls) -> None: def tearDownClass(cls) -> None:
copyfile(COPY_MCS_CONFIG_FILEPATH, MCS_CONFIG_FILEPATH) copyfile(COPY_MCS_CONFIG_FILEPATH, MCS_CONFIG_FILEPATH)
os.remove(os.path.abspath(COPY_MCS_CONFIG_FILEPATH)) os.remove(os.path.abspath(COPY_MCS_CONFIG_FILEPATH))
MCSProcessManager.stop_node(is_primary=True) MCSProcessManager.stop_node(is_primary=True, use_sudo=False)
MCSProcessManager.start_node(is_primary=True) MCSProcessManager.start_node(is_primary=True, use_sudo=False)
return super().tearDownClass() return super().tearDownClass()
def setUp(self) -> None: def setUp(self) -> None:
copyfile(TEST_MCS_CONFIG_FILEPATH, MCS_CONFIG_FILEPATH) copyfile(TEST_MCS_CONFIG_FILEPATH, MCS_CONFIG_FILEPATH)
MCSProcessManager.stop_node(is_primary=True) MCSProcessManager.stop_node(is_primary=True, use_sudo=False)
MCSProcessManager.start_node(is_primary=True) MCSProcessManager.start_node(is_primary=True, use_sudo=False)
return super().setUp() return super().setUp()

38
cmapi/cmapi_server/test/test_mcs_process_operations.py
View File

@@ -12,47 +12,47 @@ class SystemdTest(BaseProcessDispatcherCase):
def test_systemd_status_start(self): def test_systemd_status_start(self):
os.system(f'{SYSTEMCTL} stop {DDL_SERVICE}') os.system(f'{SYSTEMCTL} stop {DDL_SERVICE}')
self.assertFalse( self.assertFalse(
SystemdDispatcher.is_service_running(DDL_SERVICE) SystemdDispatcher.is_service_running(service=DDL_SERVICE, use_sudo=False)
) )
self.assertTrue(SystemdDispatcher.start(DDL_SERVICE)) self.assertTrue(SystemdDispatcher.start(service=DDL_SERVICE, use_sudo=False))
os.system(f'{SYSTEMCTL} stop {CONTROLLERNODE_SERVICE}') os.system(f'{SYSTEMCTL} stop {CONTROLLERNODE_SERVICE}')
self.assertFalse( self.assertFalse(
SystemdDispatcher.is_service_running(CONTROLLERNODE_SERVICE) SystemdDispatcher.is_service_running(service=CONTROLLERNODE_SERVICE, use_sudo=False)
) )
result = SystemdDispatcher.start(CONTROLLERNODE_SERVICE) result = SystemdDispatcher.start(service=CONTROLLERNODE_SERVICE, use_sudo=False)
self.assertTrue(result) self.assertTrue(result)
self.assertTrue( self.assertTrue(
SystemdDispatcher.is_service_running(CONTROLLERNODE_SERVICE) SystemdDispatcher.is_service_running(service=CONTROLLERNODE_SERVICE, use_sudo=False)
) )
def test_systemd_status_stop(self): def test_systemd_status_stop(self):
os.system(f'{SYSTEMCTL} start {CONTROLLERNODE_SERVICE}') os.system(f'{SYSTEMCTL} start {CONTROLLERNODE_SERVICE}')
self.assertTrue( self.assertTrue(
SystemdDispatcher.is_service_running(CONTROLLERNODE_SERVICE) SystemdDispatcher.is_service_running(service=CONTROLLERNODE_SERVICE, use_sudo=False)
) )
self.assertTrue(SystemdDispatcher.stop(CONTROLLERNODE_SERVICE)) self.assertTrue(SystemdDispatcher.stop(service=CONTROLLERNODE_SERVICE, use_sudo=False))
self.assertFalse( self.assertFalse(
SystemdDispatcher.is_service_running(CONTROLLERNODE_SERVICE) SystemdDispatcher.is_service_running(service=CONTROLLERNODE_SERVICE, use_sudo=False)
) )
def test_systemd_status_restart(self): def test_systemd_status_restart(self):
os.system(f'{SYSTEMCTL} start {CONTROLLERNODE_SERVICE}') os.system(f'{SYSTEMCTL} start {CONTROLLERNODE_SERVICE}')
self.assertTrue( self.assertTrue(
SystemdDispatcher.is_service_running(CONTROLLERNODE_SERVICE) SystemdDispatcher.is_service_running(service=CONTROLLERNODE_SERVICE, use_sudo=False)
) )
self.assertTrue(SystemdDispatcher.restart(CONTROLLERNODE_SERVICE)) self.assertTrue(SystemdDispatcher.restart(service=CONTROLLERNODE_SERVICE, use_sudo=False))
self.assertTrue( self.assertTrue(
SystemdDispatcher.is_service_running(CONTROLLERNODE_SERVICE) SystemdDispatcher.is_service_running(service=CONTROLLERNODE_SERVICE, use_sudo=False)
) )
os.system(f'{SYSTEMCTL} stop {CONTROLLERNODE_SERVICE}') os.system(f'{SYSTEMCTL} stop {CONTROLLERNODE_SERVICE}')
self.assertFalse( self.assertFalse(
SystemdDispatcher.is_service_running(CONTROLLERNODE_SERVICE) SystemdDispatcher.is_service_running(service=CONTROLLERNODE_SERVICE, use_sudo=False)
) )
self.assertTrue(SystemdDispatcher.restart(CONTROLLERNODE_SERVICE)) self.assertTrue(SystemdDispatcher.restart(service=CONTROLLERNODE_SERVICE, use_sudo=False))
self.assertTrue( self.assertTrue(
SystemdDispatcher.is_service_running(CONTROLLERNODE_SERVICE) SystemdDispatcher.is_service_running(service=CONTROLLERNODE_SERVICE, use_sudo=False)
) )
@@ -68,7 +68,7 @@ class MCSProcessManagerTest(BaseProcessDispatcherCase):
for prog in MCSProcessManager._get_sorted_progs(True, True).values(): for prog in MCSProcessManager._get_sorted_progs(True, True).values():
serv_name = self.get_systemd_serv_name(prog.service_name) serv_name = self.get_systemd_serv_name(prog.service_name)
os.system(f'{SYSTEMCTL} stop {serv_name}') os.system(f'{SYSTEMCTL} stop {serv_name}')
self.assertIsNone(MCSProcessManager.start_node(True)) self.assertIsNone(MCSProcessManager.start_node(is_primary=True, use_sudo=False))
for prog in MCSProcessManager.mcs_progs.values(): for prog in MCSProcessManager.mcs_progs.values():
serv_name = self.get_systemd_serv_name(prog.service_name) serv_name = self.get_systemd_serv_name(prog.service_name)
@@ -76,16 +76,16 @@ class MCSProcessManagerTest(BaseProcessDispatcherCase):
continue continue
self.assertTrue( self.assertTrue(
MCSProcessManager.process_dispatcher.is_service_running( MCSProcessManager.process_dispatcher.is_service_running(
serv_name service=serv_name, use_sudo=False
) )
) )
self.assertIsNone(MCSProcessManager.stop_node(is_primary=True)) self.assertIsNone(MCSProcessManager.stop_node(is_primary=True, use_sudo=False))
for prog in MCSProcessManager.mcs_progs.values(): for prog in MCSProcessManager.mcs_progs.values():
serv_name = self.get_systemd_serv_name(prog.service_name) serv_name = self.get_systemd_serv_name(prog.service_name)
self.assertFalse( self.assertFalse(
MCSProcessManager.process_dispatcher.is_service_running( MCSProcessManager.process_dispatcher.is_service_running(
serv_name service=serv_name, use_sudo=False
) )
) )
self.assertEqual(len(MCSProcessManager.get_running_mcs_procs()), 0) self.assertEqual(len(MCSProcessManager.get_running_mcs_procs()), 0)
@@ -103,7 +103,7 @@ class MCSProcessManagerTest(BaseProcessDispatcherCase):
serv_name = self.get_systemd_serv_name(prog.service_name) serv_name = self.get_systemd_serv_name(prog.service_name)
self.assertTrue( self.assertTrue(
MCSProcessManager.process_dispatcher.is_service_running( MCSProcessManager.process_dispatcher.is_service_running(
serv_name service=serv_name, use_sudo=False
) )
) )
self.assertEqual( self.assertEqual(

6
cmapi/cmapi_server/test/unittest_global.py
View File

@@ -36,7 +36,7 @@ tmp_cmapi_config_filename = './cmapi_server/test/tmp.conf'
DDL_SERVICE = 'mcs-ddlproc' DDL_SERVICE = 'mcs-ddlproc'
CONTROLLERNODE_SERVICE = 'mcs-controllernode.service' CONTROLLERNODE_SERVICE = 'mcs-controllernode.service'
UNKNOWN_SERVICE = 'unknown_service' UNKNOWN_SERVICE = 'unknown_service'
SYSTEMCTL = 'sudo systemctl' SYSTEMCTL = 'systemctl'
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
@@ -128,9 +128,9 @@ class BaseProcessDispatcherCase(unittest.TestCase):
if (MCSProcessManager.get_running_mcs_procs() !=0) == cls.node_started: if (MCSProcessManager.get_running_mcs_procs() !=0) == cls.node_started:
return super().tearDownClass() return super().tearDownClass()
if cls.node_started: if cls.node_started:
MCSProcessManager.start_node(is_primary=True) MCSProcessManager.start_node(is_primary=True, use_sudo=False)
else: else:
MCSProcessManager.stop_node(is_primary=True) MCSProcessManager.stop_node(is_primary=True, use_sudo=False)
return super().tearDownClass() return super().tearDownClass()
def setUp(self) -> None: def setUp(self) -> None: