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

Fix kernel cataloger test fixtures #1742

Merged
merged 4 commits into from
Apr 17, 2023
Merged

Fix kernel cataloger test fixtures #1742

merged 4 commits into from
Apr 17, 2023

Conversation

wagoodman
Copy link
Contributor

This PR does a few things:

  • pins the kernel test fixtures to a specific version that is not in the updates fedora channel (I needed to swap out the module under test since we couldn't pin the module being currently used)
  • caches test images in CI between runs

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman added the changelog-ignore Don't include this issue in the release changelog label Apr 17, 2023
@wagoodman wagoodman requested a review from a team April 17, 2023 14:59
@spiffcs
Copy link
Contributor

spiffcs commented Apr 17, 2023

Waiting for the CI to run to double check the cache is working as we expected from pairing then 👍

@github-actions
Copy link

github-actions bot commented Apr 17, 2023

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 v3 @ 2.40GHz%0A                                                          │ ./.tmp/benchmark-35d7165.txt │%0A                                                          │            sec/op            │%0AImagePackageCatalogers/alpmdb-cataloger-2                                    14.21m ± 5%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                              1.208m ± 6%25%0AImagePackageCatalogers/python-package-cataloger-2                            3.822m ± 4%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                    980.3µ ± 5%25%0AImagePackageCatalogers/javascript-package-cataloger-2                        541.7µ ± 7%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                    773.7µ ± 6%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                    669.5µ ± 6%25%0AImagePackageCatalogers/java-cataloger-2                                      16.09m ± 7%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                      132.1µ ± 6%25%0AImagePackageCatalogers/apkdb-cataloger-2                                     785.7µ ± 6%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                          130.8µ ± 6%25%0AImagePackageCatalogers/dotnet-deps-cataloger-2                               1.512m ± 8%25%0AImagePackageCatalogers/portage-cataloger-2                                   501.1µ ± 8%25%0AImagePackageCatalogers/nix-store-cataloger-2                                 366.8µ ± 4%25%0AImagePackageCatalogers/sbom-cataloger-2                                      146.8µ ± 3%25%0AImagePackageCatalogers/binary-cataloger-2                                    254.1µ ± 5%25%0AImagePackageCatalogers/linux-kernel-cataloger-2                              39.78m ± 9%25%0Ageomean                                                                      1.029m%0A%0A                                                          │ ./.tmp/benchmark-35d7165.txt │%0A                                                          │             B/op             │%0AImagePackageCatalogers/alpmdb-cataloger-2                                   5.068Mi ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                             140.0Ki ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                           983.3Ki ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                   180.0Ki ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                       98.66Ki ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                   169.7Ki ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                   178.4Ki ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                     2.784Mi ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                     8.595Ki ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                    145.0Ki ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                         9.907Ki ± 0%25%0AImagePackageCatalogers/dotnet-deps-cataloger-2                              409.8Ki ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                  85.85Ki ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                48.91Ki ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                     14.20Ki ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                   30.89Ki ± 0%25%0AImagePackageCatalogers/linux-kernel-cataloger-2                             62.65Mi ± 0%25%0Ageomean                                                                     192.0Ki%0A%0A                                                          │ ./.tmp/benchmark-35d7165.txt │%0A                                                          │          allocs/op           │%0AImagePackageCatalogers/alpmdb-cataloger-2                                    86.83k ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                              2.279k ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                            15.95k ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                    3.797k ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                        1.322k ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                    2.989k ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                    3.876k ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                      39.46k ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                       228.0 ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                     3.666k ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                           281.0 ± 0%25%0AImagePackageCatalogers/dotnet-deps-cataloger-2                               6.326k ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                   1.660k ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                  884.0 ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                       394.0 ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                     874.0 ± 0%25%0AImagePackageCatalogers/linux-kernel-cataloger-2                              2.793k ± 0%25%0Ageomean                                                                      2.645k

@wagoodman wagoodman enabled auto-merge (squash) April 17, 2023 15:11
@wagoodman wagoodman disabled auto-merge April 17, 2023 15:13
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman enabled auto-merge (squash) April 17, 2023 15:41
@wagoodman wagoodman merged commit 5a7bab9 into main Apr 17, 2023
@wagoodman wagoodman deleted the fix-kernel-fixtures branch April 17, 2023 15:44
spiffcs added a commit that referenced this pull request Apr 17, 2023
* main:
  Fix kernel cataloger test fixtures (#1742)
spiffcs added a commit that referenced this pull request Apr 17, 2023
* main:
  Fix kernel cataloger test fixtures (#1742)
spiffcs added a commit that referenced this pull request Apr 17, 2023
* main: (35 commits)
  Fix kernel cataloger test fixtures (#1742)
  feat: Support scanning license files in golang packages over the network (#1630)
  Add package-to-file location evidence relationships (#1698)
  Add Linux Kernel cataloger (#1694)
  Add annotations for evidence on package locations (#1723)
  add format make target (#1733)
  Update tests to not fail on Mac M1's. (#1730)
  chore(deps): update bootstrap tools to latest versions (#1728)
  Add support for nar files. (#1727)
  add highlevel details about catalogers (#1726)
  chore(deps): bump golang.org/x/net from 0.8.0 to 0.9.0 (#1722)
  chore(deps): update stereoscope to e95d60a265e384df29b7a139f5c5402d6ad72e06 (#1721)
  feat: gradle lockfile support (#1719)
  chore(deps): bump github.com/docker/docker (#1715)
  chore(deps): bump golang.org/x/mod from 0.9.0 to 0.10.0 (#1713)
  chore(deps): bump golang.org/x/term from 0.6.0 to 0.7.0 (#1714)
  chore(deps): bump github.com/spf13/cobra from 1.6.1 to 1.7.0 (#1716)
  chore(deps): bump peter-evans/create-pull-request from 4 to 5 (#1712)
  chore: update tools-golang to v0.5.0 (#1717)
  Add Nix cataloger (#1696)
  ...

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
* pin kernel and modules version for kernel fixtures

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

* cache kernel fixtures in CI

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

* update CLI test image with pinned kernel deps

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

* update the kernel version found in integration tests

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

---------

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-ignore Don't include this issue in the release changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants