Skip to content

Fix SH install script exiting too early#5147

Merged
JackThomson2 merged 1 commit intofirecracker-microvm:feature/secret-hidingfrom
JackThomson2:ci/fix_vmlinux_search
Apr 11, 2025
Merged

Fix SH install script exiting too early#5147
JackThomson2 merged 1 commit intofirecracker-microvm:feature/secret-hidingfrom
JackThomson2:ci/fix_vmlinux_search

Conversation

@JackThomson2
Copy link
Copy Markdown
Contributor

Previously this would fail on x86 as we set -e. By setting the || echo this means the script will continue. The grubby step next will fail if it failed to find the image.

Changes

...

Reason

...

License Acceptance

By submitting this pull request, I confirm that my contribution is made under
the terms of the Apache 2.0 license. For more information on following Developer
Certificate of Origin and signing off your commits, please check
CONTRIBUTING.md.

PR Checklist

  • I have read and understand CONTRIBUTING.md.
  • I have run tools/devtool checkstyle to verify that the PR passes the
    automated style checks.
  • I have described what is done in these changes, why they are needed, and
    how they are solving the problem in a clear and encompassing way.
  • I have updated any relevant documentation (both in code and in the docs)
    in the PR.
  • I have mentioned all user-facing changes in CHANGELOG.md.
  • If a specific issue led to this PR, this PR closes the issue.
  • When making API changes, I have followed the
    Runbook for Firecracker API changes.
  • I have tested all new and changed functionalities in unit tests and/or
    integration tests.
  • I have linked an issue to every new TODO.

  • This functionality cannot be added in rust-vmm.

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 9, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.73%. Comparing base (1891d72) to head (86ed07f).
Report is 1 commits behind head on feature/secret-hiding.

Additional details and impacted files
@@                  Coverage Diff                   @@
##           feature/secret-hiding    #5147   +/-   ##
======================================================
  Coverage                  82.73%   82.73%           
======================================================
  Files                        251      251           
  Lines                      27522    27522           
======================================================
  Hits                       22771    22771           
  Misses                      4751     4751           
Flag Coverage Δ
5.10-c5n.metal 83.20% <ø> (ø)
5.10-m5n.metal 83.20% <ø> (ø)
5.10-m6a.metal 82.37% <ø> (-0.01%) ⬇️
5.10-m6g.metal 79.07% <ø> (ø)
5.10-m6i.metal 83.19% <ø> (ø)
5.10-m7a.metal-48xl 82.37% <ø> (+<0.01%) ⬆️
5.10-m7g.metal 79.07% <ø> (ø)
6.1-c5n.metal 83.24% <ø> (ø)
6.1-m5n.metal 83.24% <ø> (+<0.01%) ⬆️
6.1-m6a.metal 82.41% <ø> (ø)
6.1-m6g.metal 79.07% <ø> (ø)
6.1-m6i.metal 83.24% <ø> (+<0.01%) ⬆️
6.1-m7a.metal-48xl 82.41% <ø> (ø)
6.1-m7g.metal 79.07% <ø> (ø)
6.14-c5n.metal 83.20% <ø> (-0.01%) ⬇️
6.14-m5n.metal 83.21% <ø> (ø)
6.14-m6a.metal 82.38% <ø> (ø)
6.14-m6g.metal 79.03% <ø> (ø)
6.14-m6i.metal 83.20% <ø> (ø)
6.14-m7a.metal-48xl 82.38% <ø> (-0.01%) ⬇️
6.14-m7g.metal 79.03% <ø> (-0.01%) ⬇️

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.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@JackThomson2 JackThomson2 added the Status: Awaiting review Indicates that a pull request is ready to be reviewed label Apr 10, 2025
kalyazin
kalyazin previously approved these changes Apr 10, 2025
Copy link
Copy Markdown
Contributor

@roypat roypat left a comment

Choose a reason for hiding this comment

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

Sorry, I didn't quite understand what this fixes. So now we don't fail in the variable declaration, but rather 3 lines further down? What is the benefit of that? :o

@JackThomson2
Copy link
Copy Markdown
Contributor Author

Sorry, I didn't quite understand what this fixes. So now we don't fail in the variable declaration, but rather 3 lines further down? What is the benefit of that? :o

Previously it would fail if vmlinux wasn't present even if vmlinuz is. After this the script will pass through successfully with vmlinuz

Previously this would fail on x86 as we set -e. By setting the || true
this means the script will continue. The grubby step next will fail if
it failed to find the image.

Signed-off-by: Jack Thomson <jackabt@amazon.com>
Copy link
Copy Markdown
Contributor

@roypat roypat left a comment

Choose a reason for hiding this comment

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

thanks for explaining! Bash can be so baffling 😂

@JackThomson2 JackThomson2 merged commit c1479ae into firecracker-microvm:feature/secret-hiding Apr 11, 2025
6 of 7 checks passed
@JackThomson2 JackThomson2 deleted the ci/fix_vmlinux_search branch April 11, 2025 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Status: Awaiting review Indicates that a pull request is ready to be reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants