Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: pin all cli test FROM lines to linux/amd64 #2137

Merged
merged 1 commit into from
Sep 15, 2023

Conversation

willmurphyscode
Copy link
Contributor

Many of these images have a slightly different set of packages when the arm64 variant is pulled, so that leaving this digest unpinned causes the tests to fail on arm64 hosts. Pin the FROM lines to force stable platform values regardless of host architecture.

Fixes #1788.

Draft because waiting on a response to this comment

Many of these images have a slightly different set of packages when the
arm64 variant is pulled, so that leaving this digest unpinned causes the
tests to fail on arm64 hosts. Pin the FROM lines to force stable
platform values regardless of host architecture.

Signed-off-by: Will Murphy <will.murphy@anchore.com>
@github-actions
Copy link

Benchmark Test Results

Benchmark results from the latest changes vs base branch
goos: linux%0Agoarch: amd64%0Apkg: github.com/anchore/syft/test/integration%0Acpu: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz%0A                                                              │ ./.tmp/benchmark-e733dc5.txt │%0A                                                              │            sec/op            │%0AImagePackageCatalogers/alpmdb-cataloger-2                                       14.36m ±  7%25%0AImagePackageCatalogers/apkdb-cataloger-2                                        863.1µ ±  3%25%0AImagePackageCatalogers/binary-cataloger-2                                       258.1µ ±  4%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                       756.6µ ±  3%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                   29.13µ ±  3%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                             132.7µ ±  4%25%0AImagePackageCatalogers/java-cataloger-2                                         24.84m ±  7%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                         130.9µ ± 13%25%0AImagePackageCatalogers/javascript-package-cataloger-2                           473.1µ ±  7%25%0AImagePackageCatalogers/nix-store-cataloger-2                                    355.1µ ±  5%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                       940.7µ ±  3%25%0AImagePackageCatalogers/portage-cataloger-2                                      620.0µ ±  3%25%0AImagePackageCatalogers/python-package-cataloger-2                               3.804m ±  5%25%0AImagePackageCatalogers/r-package-cataloger-2                                    282.9µ ±  4%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                       673.6µ ±  5%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                 1.104m ±  6%25%0AImagePackageCatalogers/sbom-cataloger-2                                         145.7µ ±  3%25%0Ageomean                                                                         626.0µ%0A%0A                                                              │ ./.tmp/benchmark-e733dc5.txt │%0A                                                              │             B/op             │%0AImagePackageCatalogers/alpmdb-cataloger-2                                       5.064Mi ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                        181.7Ki ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                       30.76Ki ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                       139.6Ki ± 0%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                   3.695Ki ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                             9.281Ki ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                         3.314Mi ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                         8.000Ki ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                           82.87Ki ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                    38.38Ki ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                       152.6Ki ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                      108.3Ki ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                               982.5Ki ± 0%25%0AImagePackageCatalogers/r-package-cataloger-2                                    42.37Ki ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                       165.4Ki ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                 122.4Ki ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                         14.20Ki ± 0%25%0Ageomean                                                                         91.88Ki%0A%0A                                                              │ ./.tmp/benchmark-e733dc5.txt │%0A                                                              │          allocs/op           │%0AImagePackageCatalogers/alpmdb-cataloger-2                                        74.98k ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                         3.670k ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                         866.0 ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                        2.721k ± 0%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                     132.0 ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                               270.0 ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                          43.40k ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                           218.0 ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                            1.203k ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                      751.0 ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                        3.461k ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                       2.011k ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                                15.76k ± 0%25%0AImagePackageCatalogers/r-package-cataloger-2                                      782.0 ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                        2.877k ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                  2.185k ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                           394.0 ± 0%25%0Ageomean                                                                          1.870k

@willmurphyscode willmurphyscode marked this pull request as ready for review September 15, 2023 16:47
@willmurphyscode willmurphyscode merged commit 2eb2d55 into main Sep 15, 2023
9 checks passed
@willmurphyscode willmurphyscode deleted the chore-pin-digest-cli-tests branch September 15, 2023 16:49
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
Many of these images have a slightly different sets of packages when the
arm64 variant is pulled, so that leaving this digest unpinned causes the
tests to fail on arm64 hosts. Pin the FROM lines to force stable
platform values regardless of host architecture.

Signed-off-by: Will Murphy <will.murphy@anchore.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

make cli tests fail on M1 mac because extra packages are found in test images
2 participants