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.

Sign up for GitHub

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

Jump to bottom

tests: adapt Mariner CI to unblock CH v39 upgrade #9592

Merged
merged 1 commit into from
May 7, 2024
Merged

tests: adapt Mariner CI to unblock CH v39 upgrade #9592

merged 1 commit into from
May 7, 2024

Conversation

sprt
Copy link
Contributor

@sprt sprt commented May 3, 2024 •
edited
Loading 

The CH v39 upgrade in #9575 is currently blocked because of a bug in the
Mariner host kernel. To address this, we temporarily tweak the Mariner
CI to use an Ubuntu host and the Kata guest kernel, while retaining the
Mariner initrd. This is tracked in #9594.

Importantly, this allows us to preserve CI for genpolicy. We had to
tweak the default rules.rego however, as the OCI version is now
different in the Ubuntu host. This is tracked in #9593.

This change has been tested together with CH v39 in #9588.

@katacontainersbot katacontainersbot added the size/tiny Smallest and simplest task label May 3, 2024
@sprt sprt mentioned this pull request May 3, 2024
Closed
@sprt
tests: adapt Mariner CI to unblock CH v39 upgrade
0cc2b07 
The CH v39 upgrade in kata-containers#9575 is currently blocked because of a bug in the
Mariner host kernel. To address this, we temporarily tweak the Mariner
CI to use an Ubuntu host and the Kata guest kernel, while retaining the
Mariner initrd. This is tracked in kata-containers#9594.

Importantly, this allows us to preserve CI for genpolicy. We had to
tweak the default rules.rego however, as the OCI version is now
different in the Ubuntu host. This is tracked in kata-containers#9593.

This change has been tested together with CH v39 in kata-containers#9588.

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
@sprt sprt changed the title tests: unblock Mariner CI ahead of CH v39 upgrade tests: adapt Mariner CI to unblock CH v39 upgrade May 3, 2024
@sprt sprt requested review from fidencio and likebreath May 3, 2024 16:30
@sprt sprt marked this pull request as ready for review May 3, 2024 16:32
@sprt sprt mentioned this pull request May 3, 2024
Merged
@sprt sprt added the ok-to-test label May 3, 2024
@sprt sprt requested review from GabyCT and stevenhorsman May 3, 2024 16:54
ananos
ananos approved these changes May 3, 2024
View reviewed changes
Copy link
Member

@ananos ananos left a comment

Choose a reason for hiding this comment

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

go ahead and unblock the clh upgrade ;-)

stevenhorsman
stevenhorsman approved these changes May 3, 2024
View reviewed changes
Copy link
Member

@stevenhorsman stevenhorsman left a comment

Choose a reason for hiding this comment

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

Looks okay to me. Thanks!

likebreath
likebreath approved these changes May 3, 2024
View reviewed changes
Copy link
Contributor

@likebreath likebreath left a comment

Choose a reason for hiding this comment

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

Thank you for fast turn around.

@sprt
Copy link
Contributor Author

sprt commented May 3, 2024

/test

2 similar comments
@sprt
Copy link
Contributor Author

sprt commented May 3, 2024

/test

@sprt
Copy link
Contributor Author

sprt commented May 3, 2024

/test

@stevenhorsman stevenhorsman merged commit e967db6 into kata-containers:main May 7, 2024
317 of 402 checks passed
sprt added a commit to sprt/kata-containers that referenced this pull request Jul 18, 2024
@sprt
ci: reinstates Mariner host
0d97c6b 
kata-containersGH-9592 addressed a bug in a previous version of the AKS Mariner host
kernel that blocked the CH v39 upgrade. This bug has now been fixed so
we undo that PR.

Fixes: kata-containers#9594

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
@sprt sprt mentioned this pull request Jul 18, 2024
Draft
sprt added a commit to sprt/kata-containers that referenced this pull request Jul 18, 2024
@sprt
ci: reinstate Mariner host
2491dd6 
kata-containersGH-9592 addressed a bug in a previous version of the AKS Mariner host
kernel that blocked the CH v39 upgrade. This bug has now been fixed so
we undo that PR.

Fixes: kata-containers#9594

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
sprt added a commit to sprt/kata-containers that referenced this pull request Jul 19, 2024
@sprt
ci: reinstate Mariner host
0e7ad22 
kata-containersGH-9592 addressed a bug in a previous version of the AKS Mariner host
kernel that blocked the CH v39 upgrade. This bug has now been fixed so
we undo that PR.

Note we also specify a different OCI version for Mariner as it differs
from Ubuntu's.

Fixes: kata-containers#9594

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
sprt added a commit to sprt/kata-containers that referenced this pull request Jul 19, 2024
@sprt
ci: reinstate Mariner host
b79a951 
kata-containersGH-9592 addressed a bug in a previous version of the AKS Mariner host
kernel that blocked the CH v39 upgrade. This bug has now been fixed so
we undo that PR.

Note we also specify a different OCI version for Mariner as it differs
from Ubuntu's.

Fixes: kata-containers#9594

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
sprt added a commit to sprt/kata-containers that referenced this pull request Jul 19, 2024
@sprt
ci: reinstate Mariner host
fddbd2c 
kata-containersGH-9592 addressed a bug in a previous version of the AKS Mariner host
kernel that blocked the CH v39 upgrade. This bug has now been fixed so
we undo that PR.

Note we also specify a different OCI version for Mariner as it differs
from Ubuntu's.

Fixes: kata-containers#9594

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ananos ananos ananos approved these changes

@likebreath likebreath likebreath approved these changes

@GabyCT GabyCT GabyCT approved these changes

@danmihai1 danmihai1 danmihai1 approved these changes

@stevenhorsman stevenhorsman stevenhorsman approved these changes

@fidencio fidencio Awaiting requested review from fidencio

Assignees
No one assigned
Labels
ok-to-test size/tiny Smallest and simplest task
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@sprt @ananos @likebreath @GabyCT @danmihai1 @stevenhorsman @katacontainersbot