Skip to content

Commit c094aa4

Browse files
committed
cli: skip cpu.pprof validation in TestZipIncludeAndExcludeFilesDataDriven
This patch skips cpu.pprof validation in TestZipIncludeAndExcludeFilesDataDriven to avoid flakiness in test execution. Epic: none Fixes: #147324 Release note: None
1 parent 314510c commit c094aa4

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

pkg/cli/testdata/zip/file-filters/testzip_file_filters

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include all filters
2-
--include-files=*
1+
#include all filters. We are excluding cpu.pprof file to avoid flakiness in tests.
2+
--include-files=* --exclude-files=cpu.pprof
33
----
44
debug/crdb_internal.cluster_contention_events.txt
55
debug/crdb_internal.cluster_database_privileges.txt
@@ -40,7 +40,6 @@ debug/hot-ranges-tenant.sh
4040
debug/hot-ranges.sh
4141
debug/liveness.json
4242
debug/nodes.json
43-
debug/nodes/1/cpu.pprof
4443
debug/nodes/1/crdb_internal.active_range_feeds.txt
4544
debug/nodes/1/crdb_internal.cluster_replication_node_stream_checkpoints.txt
4645
debug/nodes/1/crdb_internal.cluster_replication_node_stream_spans.txt
@@ -290,8 +289,8 @@ debug/hot-ranges.sh
290289
debug/pprof-summary.sh
291290
debug/tenant_ranges.err.txt
292291

293-
#exclude only log files
294-
--exclude-files=*.log
292+
#exclude only log files. We are excluding cpu.pprof file to avoid flakiness in tests.
293+
--exclude-files=*.log,cpu.pprof
295294
----
296295
debug/crdb_internal.cluster_contention_events.txt
297296
debug/crdb_internal.cluster_database_privileges.txt
@@ -332,7 +331,6 @@ debug/hot-ranges-tenant.sh
332331
debug/hot-ranges.sh
333332
debug/liveness.json
334333
debug/nodes.json
335-
debug/nodes/1/cpu.pprof
336334
debug/nodes/1/crdb_internal.active_range_feeds.txt
337335
debug/nodes/1/crdb_internal.cluster_replication_node_stream_checkpoints.txt
338336
debug/nodes/1/crdb_internal.cluster_replication_node_stream_spans.txt
@@ -412,16 +410,15 @@ debug/system.zones.txt
412410
debug/tenant_ranges.err.txt
413411

414412

415-
#exclude only txt files
416-
--exclude-files=*.txt
413+
#exclude only txt files. We are excluding cpu.pprof file to avoid flakiness in tests.
414+
--exclude-files=*.txt,cpu.pprof
417415
----
418416
debug/debug_zip_command_flags.txt
419417
debug/events.json
420418
debug/hot-ranges-tenant.sh
421419
debug/hot-ranges.sh
422420
debug/liveness.json
423421
debug/nodes.json
424-
debug/nodes/1/cpu.pprof
425422
debug/nodes/1/details.json
426423
debug/nodes/1/gossip.json
427424
debug/nodes/1/heap.pprof
@@ -435,8 +432,8 @@ debug/settings.json
435432
debug/tenant_ranges.err.txt
436433

437434

438-
#exclude only json files
439-
--exclude-files=*.json
435+
#exclude only json files. We are excluding cpu.pprof file to avoid flakiness in tests.
436+
--exclude-files=*.json,cpu.pprof
440437
----
441438
debug/crdb_internal.cluster_contention_events.txt
442439
debug/crdb_internal.cluster_database_privileges.txt
@@ -474,7 +471,6 @@ debug/crdb_internal.zones.txt
474471
debug/debug_zip_command_flags.txt
475472
debug/hot-ranges-tenant.sh
476473
debug/hot-ranges.sh
477-
debug/nodes/1/cpu.pprof
478474
debug/nodes/1/crdb_internal.active_range_feeds.txt
479475
debug/nodes/1/crdb_internal.cluster_replication_node_stream_checkpoints.txt
480476
debug/nodes/1/crdb_internal.cluster_replication_node_stream_spans.txt

0 commit comments

Comments
 (0)