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

Add Ubuntu 24.04 to pipelines #2447

Merged
merged 4 commits into from
Apr 12, 2024
Merged

Add Ubuntu 24.04 to pipelines #2447

merged 4 commits into from
Apr 12, 2024

Conversation

mauromorales
Copy link
Member

@mauromorales mauromorales commented Apr 8, 2024 •
edited
Loading

And introduce reusable test for uki

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
relates to #2138

@mauromorales mauromorales force-pushed the 2445-bump-ubuntu branch 2 times, most recently from 8c9a900 to 4743e60 Compare April 8, 2024 12:18
mauromorales
mauromorales commented Apr 8, 2024
View reviewed changes
.github/flavors.json
"baseImage": "ubuntu:24.04",
"arch": "arm64",
"worker": "ubuntu-latest"
},
Copy link
Member Author

Choose a reason for hiding this comment

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

not adding rpi because of the kernel issue

mauromorales
mauromorales commented Apr 8, 2024
View reviewed changes
.github/workflows/image-pr.yaml
@@ -10,24 +10,24 @@ concurrency:
env:
FORCE_COLOR: 1
jobs:
core:
core-ubuntu-22-lts:
Copy link
Member Author

Choose a reason for hiding this comment

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

for PRs I'm removing 23.10 completely because it will be tested on master

mauromorales
mauromorales commented Apr 8, 2024
View reviewed changes
.github/workflows/release.yaml
@@ -38,7 +38,7 @@ jobs:
sudo apt update && sudo apt install -y jq
- id: set-matrix
run: |
content=`cat ./.github/flavors.json | jq -r 'map(select(.arch == "amd64" and .variant == "core" and (.flavor == "fedora" or (.flavor == "ubuntu" and .flavorRelease == "23.10"))))'`
content=`cat ./.github/flavors.json | jq -r 'map(select(.arch == "amd64" and .variant == "core" and (.flavor == "fedora" or (.flavor == "ubuntu" and (.flavorRelease == "23.10" or .flavorRelease == "24.04")))))'`
Copy link
Member Author

Choose a reason for hiding this comment

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

I thought it might be good to also produce the 24.04 uki in case it's helpful to test that one too

@mauromorales mauromorales force-pushed the 2445-bump-ubuntu branch 2 times, most recently from 54b014d to 23c35a4 Compare April 8, 2024 12:32
@mauromorales mauromorales mentioned this pull request Apr 8, 2024
Closed
3 tasks
@mauromorales mauromorales requested a review from a team April 8, 2024 13:31
@mauromorales mauromorales marked this pull request as ready for review April 8, 2024 13:31
@mauromorales mauromorales force-pushed the 2445-bump-ubuntu branch 2 times, most recently from 2ee7eda to d9e3d9e Compare April 9, 2024 06:51
@mauromorales
Copy link
Member Author

Unfortunately this is not working with UKI:

2024-04-09T12:48:34Z ERR running systemd-pcrphase error="exit status 127"
2024-04-09T12:48:34Z DBG systemd-pcrphase leave-initrd out="/bin/sh: 1: /usr/lib/systemd/systemd-pcrphase: not found\n"
bash: cannot set terminal process group (-1): Inappropriate ioctl for device
bash: no job control in this shell

Apparently the binary systemd-pcrphrase has been removed in favor of systemd-pcrextend, docs: https://manpages.ubuntu.com/manpages/noble/en/man8/systemd-pcrextend.8.html

We need to extend immucore to check which of the two binaries exist before we can continue here

@mauromorales
Copy link
Member Author

This is now working as expected but will put as blocked because we need to revert immucore changes temporarily

@mauromorales mauromorales self-assigned this Apr 11, 2024
@kreeuwijk
Copy link

@mauromorales I ran into the same issue today. Can you let me know when I can rebuild a Kairos image with the immucore changes implemented?

@mauromorales
Copy link
Member Author

mauromorales commented Apr 11, 2024 •
edited
Loading

@kreeuwijk will do ... in the meantime, if you're building your image with earthly, you should be able to pass the IMMUCORE_DEV_BRANCH e.g.:

earthly +base-image --FLAVOR=ubuntu --FLAVOR_RELEASE=24.04 --FAMILY=ubuntu --MODEL=generic --VARIANT=core --BASE_IMAGE=ubuntu:24.04 --BOOTLOADER=systemd-boot --IMMUCORE_DEV_BRANCH=main

@kreeuwijk
Copy link

kreeuwijk commented Apr 11, 2024 •
edited
Loading

I was able to build a Kairos image with earthly. I did need to use a custom base image instead of ubuntu:24.04, as the Kairos build will fail due to there being no content in /usr/lib/modules and /lib/modulles. So in my custom base image I do

FROM ubuntu:24.04
RUN apt-get update && \
    apt-get install -y --no-install-recommends linux-image-generic-hwe-24.04 && \
    apt-get clean

to ensure the expected content is present.

@mauromorales
Copy link
Member Author

ah yes sorry, I forgot to mention you'd need to be on this branch but nice to see that the factory works as expected 🙌

@mauromorales
Copy link
Member Author

not blocked any more, rebased from master and if tests are green, it's good to merge

@mauromorales mauromorales enabled auto-merge (squash) April 12, 2024 07:30
@mauromorales
Copy link
Member Author

If #2291 gets merged before this one, we need to also add 24.04 in those new tests

@mauromorales mauromorales mentioned this pull request Apr 12, 2024
Merged
@mauromorales
Copy link
Member Author

master is still pointing to a framework image with immucore 0.1.24 so still blocked

@mauromorales
Add Ubuntu 24.04 to pipelines
5ffa0e8 
And introduce reusable test for uki

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
@mauromorales
Introduce new kernel
1080fc1 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
@mauromorales
Add rpi4
2df1e47 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
@mauromorales
Adapt new custom partitioning test
21b4cf8 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
@mauromorales
Copy link
Member Author

looks good now, merging

@mauromorales mauromorales merged commit 7f121a4 into master Apr 12, 2024
38 of 41 checks passed
@mauromorales mauromorales deleted the 2445-bump-ubuntu branch April 12, 2024 16:28
@mauromorales
Copy link
Member Author

@kreeuwijk this has been merged and you can also consume the following artifact if it helps quay.io/kairos/ubuntu:24.04-core-amd64-generic-master-uki

mauromorales added a commit that referenced this pull request May 2, 2024
@mauromorales
Add Ubuntu 24.04 to pipelines (#2447)
73e6583 
* Add Ubuntu 24.04 to pipelines

And introduce reusable test for uki

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

* Introduce new kernel

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

* Add rpi4

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

* Adapt new custom partitioning test

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

---------

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Itxaka Itxaka Itxaka approved these changes

@jimmykarily jimmykarily jimmykarily approved these changes

Assignees

@mauromorales mauromorales

Labels
None yet
Projects
🧙Issue tracking board
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mauromorales @kreeuwijk @Itxaka @jimmykarily