From 0480b516f65599a551fcd222abbeb2533c55701c Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Thu, 15 May 2025 14:35:11 -0400 Subject: [PATCH] chore: fix publishing test fixture images (#3896) * update pkg counts Signed-off-by: Alex Goodman * bump max cache size Signed-off-by: Alex Goodman --------- Signed-off-by: Alex Goodman --- Taskfile.yaml | 4 ++-- .../integration/package_deduplication_test.go | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Taskfile.yaml b/Taskfile.yaml index a0ba8cfb5..e07b4c564 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -453,8 +453,8 @@ tasks: find . | grep cache | grep tar | xargs du echo "total $total_size KB" - if [ "$total_size" -gt 1048576 ]; then - echo 'docker cache is larger than 1GB' + if [ "$total_size" -gt 5242880 ]; then + echo 'docker cache is larger than 5GB' exit 1 fi diff --git a/cmd/syft/internal/test/integration/package_deduplication_test.go b/cmd/syft/internal/test/integration/package_deduplication_test.go index ab8e580f8..594c762bc 100644 --- a/cmd/syft/internal/test/integration/package_deduplication_test.go +++ b/cmd/syft/internal/test/integration/package_deduplication_test.go @@ -19,7 +19,7 @@ func TestPackageDeduplication(t *testing.T) { }{ { scope: source.AllLayersScope, - packageCount: 178, // without deduplication this would be ~600 + packageCount: 175, // without deduplication this would be ~600 instanceCount: map[string]int{ "basesystem": 1, "wget": 1, @@ -30,15 +30,15 @@ func TestPackageDeduplication(t *testing.T) { locationCount: map[string]int{ "basesystem-11-13.el9": 5, // in all layers "curl-minimal-7.76.1-26.el9_3.2.0.1": 2, // base + wget layer - "curl-minimal-7.76.1-29.el9_4.1": 3, // curl upgrade layer + all above layers + "curl-minimal-7.76.1-31.el9": 3, // curl upgrade layer + all above layers "wget-1.21.1-8.el9_4": 4, // wget + all above layers - "vsftpd-3.0.5-5.el9": 2, // vsftpd + all above layers - "httpd-2.4.57-11.el9_4.1": 1, // last layer + "vsftpd-3.0.5-6.el9": 2, // vsftpd + all above layers + "httpd-2.4.62-1.el9_5.2": 1, // last layer }, }, { scope: source.SquashedScope, - packageCount: 172, + packageCount: 169, instanceCount: map[string]int{ "basesystem": 1, "wget": 1, @@ -47,11 +47,11 @@ func TestPackageDeduplication(t *testing.T) { "httpd": 1, // rpm, binary is now excluded by overlap }, locationCount: map[string]int{ - "basesystem-11-13.el9": 1, - "curl-minimal-7.76.1-29.el9_4.1": 1, // upgrade - "wget-1.21.1-8.el9_4": 1, - "vsftpd-3.0.5-5.el9": 1, - "httpd-2.4.57-11.el9_4.1": 1, + "basesystem-11-13.el9": 1, + "curl-minimal-7.76.1-31.el9": 1, // upgrade + "wget-1.21.1-8.el9_4": 1, + "vsftpd-3.0.5-6.el9": 1, + "httpd-2.4.62-1.el9_5.2": 1, }, }, }