diff --git a/tests/platform_tests/conftest.py b/tests/platform_tests/conftest.py index 856f69b13f6..bde599de7f9 100644 --- a/tests/platform_tests/conftest.py +++ b/tests/platform_tests/conftest.py @@ -21,10 +21,15 @@ FMT = "%b %d %H:%M:%S.%f" FMT_SHORT = "%b %d %H:%M:%S" FMT_ALT = "%Y-%m-%dT%H:%M:%S.%f%z" -SMALL_DISK_SKUS = [ - "Arista-7060CX-32S-C32", - "Arista-7060CX-32S-Q32", - "Arista-7060CX-32S-D48C8" +LOGS_ON_TMPFS_PLATFORMS = [ + "x86_64-arista_7050_qx32", + "x86_64-arista_7050_qx32s", + "x86_64-arista_7060_cx32s", + "x86_64-arista_7260cx3_64", + "x86_64-arista_7050cx3_32s", + "x86_64-mlnx_msn2700-r0", + "x86_64-dell_s6100_c2538-r0", + "armhf-nokia_ixs7215_52x-r0" ] @@ -452,7 +457,7 @@ def advanceboot_loganalyzer(duthosts, enum_rand_one_per_hwsku_frontend_hostname, name='device_type') for arg in mark.args] if 'vs' not in device_marks: pytest.skip('Testcase not supported for kvm') - hwsku = duthost.facts["hwsku"] + platform = duthost.facts["platform"] logs_in_tmpfs = list() loganalyzer = LogAnalyzer( @@ -486,7 +491,7 @@ def pre_reboot_analysis(): True if (log_filesystem and "tmpfs" in log_filesystem) else False) base_os_version.append(get_current_sonic_version(duthost)) bgpd_log = bgpd_log_handler(preboot=True) - if hwsku in SMALL_DISK_SKUS or (len(logs_in_tmpfs) > 0 and logs_in_tmpfs[0] is True): + if platform in LOGS_ON_TMPFS_PLATFORMS or (len(logs_in_tmpfs) > 0 and logs_in_tmpfs[0] is True): # For small disk devices, /var/log in mounted in tmpfs. # Hence, after reboot the preboot logs are lost. # For log_analyzer to work, it needs logs from the shutdown path @@ -508,7 +513,7 @@ def pre_reboot_analysis(): def post_reboot_analysis(marker, event_counters=None, reboot_oper=None, log_dir=None): bgpd_log_handler() - if hwsku in SMALL_DISK_SKUS or (len(logs_in_tmpfs) > 0 and logs_in_tmpfs[0] is True): + if platform in LOGS_ON_TMPFS_PLATFORMS or (len(logs_in_tmpfs) > 0 and logs_in_tmpfs[0] is True): restore_backup = "mv /host/syslog.99 /var/log/; " +\ "mv /host/sairedis.rec.99 /var/log/swss/; " +\ "mv /host/swss.rec.99 /var/log/swss/; " +\