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

noop comments to force rebuilding of packages and get sboms #3595

Merged
merged 1 commit into from
Nov 21, 2023

Conversation

deitch
Copy link
Contributor

@deitch deitch commented Nov 16, 2023

These changes are all a noop; they just add a simple comment to the pkg Dockerfile.

This does, however, change the git tree hash for those packages. With #3592 merged in, linuxkit will add an SBoM to those container images (via buildkit), which will be consumed in future PRs.

I went through images/rootfs.yml.in and found all of the images referenced there; those are the ones I updated. These are:

  • acrn
  • apparmor
  • debug
  • edgeview
  • guacd
  • kdump
  • measure-config
  • newlogd
  • pillar
  • rngd
  • storage-init
  • vtpm
  • watchdog
  • wlan
  • wwan
  • xen-tools

@@ -1,4 +1,5 @@
# syntax=docker/dockerfile-upstream:1.5.0-rc2-labs
# Dockerfile to build acrn
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is worth adding license/ copyright header for all files while we are here

# Copyright (c) 2023 Zededa, Inc.
# SPDX-License-Identifier: Apache-2.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, that is even cleaner.

Copy link

codecov bot commented Nov 16, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8ea9bae) 19.43% compared to head (b1004e5) 19.43%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #3595   +/-   ##
=======================================
  Coverage   19.43%   19.43%           
=======================================
  Files         232      232           
  Lines       50533    50533           
=======================================
  Hits         9819     9819           
  Misses      39994    39994           
  Partials      720      720           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@deitch
Copy link
Contributor Author

deitch commented Nov 16, 2023

Why did the eden tests fail?

@deitch
Copy link
Contributor Author

deitch commented Nov 16, 2023

I don't understand why these are not building? It is complaining about the image not being in the cache, but it builds it locally.

@rucoder
Copy link
Contributor

rucoder commented Nov 16, 2023

I don't understand why these are not building? It is complaining about the image not being in the cache, but it builds it locally.

did you rebase on top of latest master? there was a fix for eden yesterday

@deitch
Copy link
Contributor Author

deitch commented Nov 16, 2023

Possible I am out of date. I will do so now.

@deitch deitch force-pushed the packages-force-rebuild-sboms branch from 533f001 to d69eb7c Compare November 16, 2023 14:59
@deitch
Copy link
Contributor Author

deitch commented Nov 16, 2023

I tried a rebase, nothing changed. I did update the comments you suggested. Let it run again.

@github-actions github-actions bot requested a review from rucoder November 16, 2023 15:00
Copy link
Contributor

@rucoder rucoder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@deitch deitch marked this pull request as draft November 19, 2023 15:40
@deitch
Copy link
Contributor Author

deitch commented Nov 19, 2023

I converted this to draft. I found a bug in the linuxkit pkg build which successfully adds the sbom, but loses it when pushing out to the registry. Oops. A fix already is in the works, but let's hold on this until that is in place.

@deitch
Copy link
Contributor Author

deitch commented Nov 20, 2023

Bug in linuxkit fixed, update is in #3604; when that is in, I will rebase and push this, then convert it from draft to ready.

@deitch deitch force-pushed the packages-force-rebuild-sboms branch from d69eb7c to 46ad212 Compare November 21, 2023 07:42
@deitch deitch marked this pull request as ready for review November 21, 2023 07:43
@deitch
Copy link
Contributor Author

deitch commented Nov 21, 2023

This is now ready for review.

@deitch deitch force-pushed the packages-force-rebuild-sboms branch from ef6a361 to 46ad212 Compare November 21, 2023 13:56
Signed-off-by: Avi Deitcher <avi@deitcher.net>
@deitch deitch force-pushed the packages-force-rebuild-sboms branch from 46ad212 to b1004e5 Compare November 21, 2023 17:44
Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@eriknordmark eriknordmark merged commit 43a8d45 into lf-edge:master Nov 21, 2023
28 of 33 checks passed
@deitch deitch deleted the packages-force-rebuild-sboms branch November 22, 2023 07:28
@deitch
Copy link
Contributor Author

deitch commented Nov 22, 2023

So it did rebuild, but the pushed-out packages are missing the sboms. I do not yet know why, but I will investigate.

@deitch
Copy link
Contributor Author

deitch commented Nov 22, 2023

It looks like this is an issue in buildkit running in GHA, but I cannot be sure. Still working on it.

@deitch
Copy link
Contributor Author

deitch commented Nov 22, 2023

It gets stranger. I just uploaded the lkt cache as an artifact, so I could download it and see it. The manifest has the sboms. Which makes me wonder, perhaps it is working at build, but not at push?

@deitch
Copy link
Contributor Author

deitch commented Nov 22, 2023

OK, I have it. Bug in linuxkit, a path that I didn't realize we used and wasn't properly checked. Expect a PR soon enough.

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.

3 participants