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 Github Actions for Ubuntu-24.04 #11112

Merged
merged 6 commits into from
Oct 16, 2024
Merged

Conversation

dereknola
Copy link
Member

@dereknola dereknola commented Oct 15, 2024

Proposed Changes

  • Fix lsof output for flock utility function. Ubuntu 24.04 moved to a new(ish) version of lsof which included Fix FD field description lsof-org/lsof#158.

    Old lsof Newish lsof
    image image
  • Fix composite action for libvirt/vagrant installation. Now works on ubuntu-24.04

  • Pinned e2e and unit test workflows to ubuntu-24.04 to prevent future disruption (in 2 years I can manually open PRs for ubuntu-26.04)

Types of Changes

Verification

Testing

Linked Issues

User-Facing Change


Further Comments

@dereknola dereknola marked this pull request as ready for review October 15, 2024 16:30
@dereknola dereknola requested a review from a team as a code owner October 15, 2024 16:30
pkg/flock/flock_unix.go Outdated Show resolved Hide resolved
@dereknola dereknola changed the title [WIP] GHA 24.04 Fix Github Actions for Ubuntu-24.04 Oct 15, 2024
Copy link

codecov bot commented Oct 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 44.17%. Comparing base (536fa44) to head (6f2ce21).
Report is 3 commits behind head on master.

❗ There is a different number of reports uploaded between BASE (536fa44) and HEAD (6f2ce21). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (536fa44) HEAD (6f2ce21)
e2etests 7 6
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #11112      +/-   ##
==========================================
- Coverage   49.91%   44.17%   -5.75%     
==========================================
  Files         178      178              
  Lines       14820    14813       -7     
==========================================
- Hits         7398     6544     -854     
- Misses       6070     7062     +992     
+ Partials     1352     1207     -145     
Flag Coverage Δ
e2etests 36.49% <ø> (-9.46%) ⬇️
inttests 36.83% <ø> (+<0.01%) ⬆️
unittests 13.54% <ø> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

brandond
brandond previously approved these changes Oct 16, 2024
"testing"
)

// checkLock checks whether any process is using the lock
func checkLock(path string) bool {
lockByte, _ := exec.Command("lsof", "-w", "-F", "lfn", path).Output()
Copy link
Contributor

Choose a reason for hiding this comment

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

should we check for the error here? and return false if err != nil ?

@dereknola dereknola merged commit 4888376 into k3s-io:master Oct 16, 2024
30 checks passed
@dereknola dereknola deleted the e2e_2404 branch October 23, 2024 20:42
dereknola added a commit to dereknola/k3s that referenced this pull request Nov 4, 2024
* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

Signed-off-by: Derek Nola <[email protected]>
dereknola added a commit to dereknola/k3s that referenced this pull request Nov 4, 2024
* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

Signed-off-by: Derek Nola <[email protected]>
dereknola added a commit to dereknola/k3s that referenced this pull request Nov 4, 2024
* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

Signed-off-by: Derek Nola <[email protected]>
dereknola added a commit to dereknola/k3s that referenced this pull request Nov 5, 2024
* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

Signed-off-by: Derek Nola <[email protected]>
dereknola added a commit to dereknola/k3s that referenced this pull request Nov 5, 2024
* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

Signed-off-by: Derek Nola <[email protected]>
dereknola added a commit to dereknola/k3s that referenced this pull request Nov 5, 2024
* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

Signed-off-by: Derek Nola <[email protected]>
dereknola added a commit to dereknola/k3s that referenced this pull request Nov 5, 2024
* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

Signed-off-by: Derek Nola <[email protected]>
dereknola added a commit that referenced this pull request Nov 5, 2024
* Fix Github Actions for Ubuntu-24.04 (#11112)

* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

Signed-off-by: Derek Nola <[email protected]>

* Pin vagrant to older version to avoid known issue 13527

Signed-off-by: Derek Nola <[email protected]>

---------

Signed-off-by: Derek Nola <[email protected]>
dereknola added a commit that referenced this pull request Nov 5, 2024
* Fix Github Actions for Ubuntu-24.04 (#11112)

* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

Signed-off-by: Derek Nola <[email protected]>

* Pin vagrant to older version to avoid known issue 13527

Signed-off-by: Derek Nola <[email protected]>

---------

Signed-off-by: Derek Nola <[email protected]>
dereknola added a commit that referenced this pull request Nov 5, 2024
* Fix Github Actions for Ubuntu-24.04 (#11112)

* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

Signed-off-by: Derek Nola <[email protected]>

* Pin vagrant to older version to avoid known issue 13527

Signed-off-by: Derek Nola <[email protected]>

---------

Signed-off-by: Derek Nola <[email protected]>
dereknola added a commit that referenced this pull request Nov 5, 2024
* Fix Github Actions for Ubuntu-24.04 (#11112)

* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

Signed-off-by: Derek Nola <[email protected]>

* Pin vagrant to older version to avoid known issue 13527

Signed-off-by: Derek Nola <[email protected]>

---------

Signed-off-by: Derek Nola <[email protected]>
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.

4 participants