Skip to content

Commit 9f04df1

Browse files
authored
DTIN-6267: Clean up flaky Github actions (#1337)
1 parent c9f4bd4 commit 9f04df1

File tree

3 files changed

+210
-233
lines changed

3 files changed

+210
-233
lines changed

.circleci/docker_unified_smoke_unit/smoketest/smoketest.py

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -989,53 +989,30 @@ class K8sActor(DockerSmokeTestActor):
989989

990990
VERIFIER_TYPE = "Kubernetes"
991991
EXPECTED_DOCKER_METRICS = [
992-
"docker.cpu.throttling.throttled_time",
992+
"docker.cpu.system_cpu_usage",
993993
"docker.cpu.throttling.periods",
994994
"docker.cpu.throttling.throttled_periods",
995-
"docker.cpu.system_cpu_usage",
995+
"docker.cpu.throttling.throttled_time",
996996
"docker.cpu.total_usage",
997-
"docker.cpu.usage_in_usermode",
998997
"docker.cpu.usage_in_kernelmode",
998+
"docker.cpu.usage_in_usermode",
999999
"docker.mem.limit",
1000-
"docker.mem.usage",
1001-
"docker.mem.max_usage",
1002-
"docker.mem.stat.active_file",
1003-
"docker.mem.stat.total_writeback",
10041000
"docker.mem.stat.active_anon",
1005-
"docker.mem.stat.total_pgpgout",
1006-
"docker.mem.stat.total_pgmajfault",
1007-
"docker.mem.stat.total_rss_huge",
1008-
"docker.mem.stat.total_inactive_file",
1001+
"docker.mem.stat.active_file",
1002+
"docker.mem.stat.inactive_anon",
10091003
"docker.mem.stat.inactive_file",
10101004
"docker.mem.stat.pgfault",
1011-
"docker.mem.stat.total_cache",
1012-
"docker.mem.stat.total_pgfault",
1013-
"docker.mem.stat.total_mapped_file",
1014-
"docker.mem.stat.inactive_anon",
10151005
"docker.mem.stat.pgmajfault",
1016-
"docker.mem.stat.pgpgin",
1017-
"docker.mem.stat.rss_huge",
1018-
"docker.mem.stat.rss",
1019-
"docker.mem.stat.hierarchical_memory_limit",
10201006
"docker.mem.stat.unevictable",
1021-
"docker.mem.stat.total_unevictable",
1022-
"docker.mem.stat.cache",
1023-
"docker.mem.stat.mapped_file",
1024-
"docker.mem.stat.total_rss",
1025-
"docker.mem.stat.total_active_anon",
1026-
"docker.mem.stat.total_active_file",
1027-
"docker.mem.stat.writeback",
1028-
"docker.mem.stat.pgpgout",
1029-
"docker.mem.stat.total_inactive_anon",
1030-
"docker.mem.stat.total_pgpgin",
1031-
"docker.net.rx_packets",
1032-
"docker.net.tx_packets",
1007+
"docker.mem.usage",
10331008
"docker.net.rx_bytes",
1034-
"docker.net.tx_errors",
1009+
"docker.net.rx_dropped",
10351010
"docker.net.rx_errors",
1011+
"docker.net.rx_packets",
10361012
"docker.net.tx_bytes",
1037-
"docker.net.rx_dropped",
10381013
"docker.net.tx_dropped",
1014+
"docker.net.tx_errors",
1015+
"docker.net.tx_packets",
10391016
]
10401017

10411018
def _get_expected_agent_logfiles(self):

0 commit comments

Comments
 (0)