From b938e36e36f04fa94e95b3a9ba5c762cfb2c4fb3 Mon Sep 17 00:00:00 2001 From: Xiao Liang Date: Fri, 27 Sep 2024 13:57:55 +0800 Subject: [PATCH] add msg_246~msg_249 to baseline log Signed-off-by: Xiao Liang --- os_tests/cfg/os-tests.yaml | 2 +- os_tests/data/baseline_log.json | 48 ++++++++++++++++++++++++++++ os_tests/tests/test_general_check.py | 4 +-- os_tests/tests/test_lifecycle.py | 6 ++++ os_tests/tests/test_rhel_cert.py | 17 +++++----- 5 files changed, 65 insertions(+), 12 deletions(-) diff --git a/os_tests/cfg/os-tests.yaml b/os_tests/cfg/os-tests.yaml index 3978e55e..1353e676 100644 --- a/os_tests/cfg/os-tests.yaml +++ b/os_tests/cfg/os-tests.yaml @@ -35,7 +35,7 @@ subscription_password: # enable case result auto check, it calls the baseline_log.json data. enable_auto_result_check: True # specify the network bandwidth manually, it is optional, set to 100 which is max for most senarios -net_bandwidth: 100 +net_bandwidth: # list supported cases without real run is_listcase: False # filter case by name and run it in specified order, add --strict for matching exactly diff --git a/os_tests/data/baseline_log.json b/os_tests/data/baseline_log.json index 1228d962..5bb19759 100644 --- a/os_tests/data/baseline_log.json +++ b/os_tests/data/baseline_log.json @@ -2289,5 +2289,53 @@ "cases": "os_tests.tests.test_general_test.TestGeneralTest.test_imds_tracer", "addedby": "xiliang@redhat.com", "addeddate": "20240918" + }, + "msg_246": { + "content": ".*/etc/cron.hourly/0anacron: line 11: /etc/default/anacron: No such file or directory.*", + "analyze": "known issue", + "branch": "rhel10", + "status": "active", + "link": "https://issues.redhat.com/browse/RHEL-42706", + "path": "", + "trigger": "", + "cases": "", + "addedby": "xiliang@redhat.com", + "addeddate": "20240920" + }, + "msg_247": { + "content": ".*/usr/sbin/grub2-probe.*failed to get canonical path of .*overlay.*", + "analyze": "known issue in bootc image", + "branch": "rhel9", + "status": "active", + "link": "https://issues.redhat.com/browse/RHEL-59866", + "path": "", + "trigger": "", + "cases": "os_tests.tests.test_general_test.TestGeneralTest.test_grub2_mkconfig", + "addedby": "xiliang@redhat.com", + "addeddate": "20240924" + }, + "msg_248": { + "content": ".*nvidia-persistenced.service.*PIDFile= references a path below legacy directory /var/run/.*", + "analyze": "known issue", + "branch": "rhelai", + "status": "active", + "link": "https://issues.redhat.com/browse/RHELAI-1532", + "path": "", + "trigger": "", + "cases": "", + "addedby": "xiliang@redhat.com", + "addeddate": "20240924" + }, + "msg_249": { + "content": ".*fwupd.*SMBIOS BIOS Characteristics Extension Byte 2 is invalid -- UEFI Specification is unsupported, but /sys/firmware/efi exists: System does not support UEFI mode.*", + "analyze": "known issue", + "branch": "rhel", + "status": "active", + "link": "https://issues.redhat.com/browse/RHEL-60244", + "path": "", + "trigger": "", + "cases": "", + "addedby": "xiliang@redhat.com", + "addeddate": "20240926" } } \ No newline at end of file diff --git a/os_tests/tests/test_general_check.py b/os_tests/tests/test_general_check.py index d823dddf..34334a8c 100644 --- a/os_tests/tests/test_general_check.py +++ b/os_tests/tests/test_general_check.py @@ -810,8 +810,8 @@ def test_check_journalctl_not_found(self): 2 component: journal - bugzilla_id: - 1855252 + bug_id: + bugzilla_1855252,jira_RHEL-42706 customer_case_id: polarion_id: diff --git a/os_tests/tests/test_lifecycle.py b/os_tests/tests/test_lifecycle.py index 718f7c40..f7c922d5 100644 --- a/os_tests/tests/test_lifecycle.py +++ b/os_tests/tests/test_lifecycle.py @@ -269,6 +269,12 @@ def test_boot_fipsenabled(self): cmd = 'sudo dnf remove kernel-debug -y' utils_lib.run_cmd(self, cmd, msg='remove debug kernel to save space') utils_lib.run_cmd(self, fips_enable_cmd, msg='Enable fips again!', timeout=600) + if 'OSTree' in out: + cmd = 'sudo fips-mode-setup --enable --no-bootcfg' + utils_lib.run_cmd(self, cmd, msg='append no-bootcfg in bootc image') + cmd = 'sudo rpm-ostree kargs --append=fips=1' + utils_lib.run_cmd(self, cmd, timeout=600, msg='append fips=1 to boot param') + utils_lib.run_cmd(self, 'sudo reboot', msg='reboot system under test') time.sleep(10) utils_lib.init_connection(self, timeout=self.ssh_timeout) diff --git a/os_tests/tests/test_rhel_cert.py b/os_tests/tests/test_rhel_cert.py index de76eb84..c727ce0c 100644 --- a/os_tests/tests/test_rhel_cert.py +++ b/os_tests/tests/test_rhel_cert.py @@ -58,9 +58,9 @@ def _wait_cert_done(self, timeout=1200, interval=30, prefix=''): return True def _parted_swap_partition(self, root_vol): - swap_start = root_vol.size + 3 - swap_end = root_vol.size + 8 - if not root_vol.modify_disk_size(expand_num=10): + swap_start = root_vol.size + 4 + swap_end = root_vol.size + 18 + if not root_vol.modify_disk_size(expand_num=20): self.fail("cannot extend disk size") parts = utils_lib.run_cmd(self, "lsblk -r -o NAME,TYPE|grep part|sort|awk -F' ' '{print $1}'") tmp_parts_list = parts.split('\n') @@ -154,7 +154,7 @@ def setUp(self): self.log.info("Pick up nic {}".format(self.active_nic )) cmd = "ip addr show {}".format(self.active_nic ) output = utils_lib.run_cmd(self, cmd, expect_ret=0, rmt_node=self.params['remote_nodes'][-1], msg='try to get {} ipv4 address'.format(self.active_nic )) - self.rmt_ipv4 = re.findall('[\d.]{7,16}', output)[0] + self.rmt_ipv4 = re.findall('[\\d.]{7,16}', output)[0] cmd = 'sudo bash -c "rhcertd start"' utils_lib.run_cmd(self, cmd, expect_ret=0, rmt_node=self.params['remote_nodes'][-1], msg="start rhcertd on test server") cmd = 'sudo cat /root/.ssh/id_rsa.pub' @@ -275,7 +275,6 @@ def test_rhcert_non_interactive(self): cmd = 'sudo bash -c "yes|rhcert-cli plan"' auto_plan = utils_lib.run_cmd(self,cmd, timeout=3600, msg='create test plan') subtests = [] - #if not utils_lib.is_metal(self): subtests.append('hwcert/memory') # case name denpends on cert pkg version, the latest cert tool cannot recognize hwcert/xxx cases subtests.append('memory') @@ -320,14 +319,14 @@ def test_rhcert_kdump(self): cmd = 'sudo bash -c "yes|rhcert-cli run --test kdump --device local"' utils_lib.run_cmd(self,cmd, timeout=1800, msg='run kdump local test') if not self.SSH.is_active(): - utils_lib.init_connection(self, timeout=self.ssh_timeout) + utils_lib.init_connection(self, timeout=self.ssh_timeout*2) time.sleep(30) self._wait_cert_done(prefix='local') utils_lib.is_pkg_installed(self,'nfs-utils') cmd = 'sudo bash -c "yes|rhcert-cli run --test kdump --device nfs --server {}"'.format(self.rmt_ipv4) utils_lib.run_cmd(self,cmd, timeout=1800, msg='run kdump nfs test') if not self.SSH.is_active(): - utils_lib.init_connection(self, timeout=self.ssh_timeout) + utils_lib.init_connection(self, timeout=self.ssh_timeout*2) time.sleep(30) self._wait_cert_done(prefix='nfs') @@ -372,14 +371,14 @@ def test_rhcert_kdump_aws_arm_irqpoll(self): cmd = 'sudo bash -c "yes|rhcert-cli run --test kdump --device local"' utils_lib.run_cmd(self,cmd, timeout=1800, msg='run kdump local test') if not self.SSH.is_active(): - utils_lib.init_connection(self, timeout=self.ssh_timeout) + utils_lib.init_connection(self, timeout=self.ssh_timeout*2) time.sleep(30) self._wait_cert_done(prefix='local_irqpoll') utils_lib.is_pkg_installed(self,'nfs-utils') cmd = 'sudo bash -c "yes|rhcert-cli run --test kdump --device nfs --server {}"'.format(self.rmt_ipv4) utils_lib.run_cmd(self,cmd, timeout=1800, msg='run kdump nfs test') if not self.SSH.is_active(): - utils_lib.init_connection(self, timeout=self.ssh_timeout) + utils_lib.init_connection(self, timeout=self.ssh_timeout*2) time.sleep(30) self._wait_cert_done(prefix='nfs_irqpoll')