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

Image refresh for arch #7063

Merged
merged 6 commits into from
Nov 7, 2024
Merged

Image refresh for arch #7063

merged 6 commits into from
Nov 7, 2024

Conversation

cockpituous
Copy link
Contributor

@cockpituous cockpituous commented Nov 4, 2024 •
edited by martinpitt
Loading

Image refresh for arch

@cockpituous cockpituous changed the title Image refresh for arch WIP: 780443d82d38: [no-test] Image refresh for arch Nov 4, 2024
@cockpituous
Copy link
Contributor

image-refresh arch done: https://github.com/cockpit-project/bots/commits/image-refresh-arch-20241104-111648

cockpituous pushed a commit that referenced this pull request Nov 4, 2024
images: Update arch image
483ca45 
Closes #7063
@cockpituous cockpituous force-pushed the image-refresh-arch-20241104-111648 branch from df2a5d4 to 483ca45 Compare November 4, 2024 11:16
@cockpituous cockpituous changed the title WIP: 780443d82d38: [no-test] Image refresh for arch Image refresh for arch Nov 4, 2024
@cockpituous
Copy link
Contributor

Success. Log: https://cockpit-logs.us-east-1.linodeobjects.com/image-refresh-arch-7e11f78e-20241104-110406/log.html

@martinpitt
Copy link
Member

Looks like we need to put back openbsd-netcat explicitly

@jelly
Copy link
Member Author

jelly commented Nov 4, 2024

Looks like we need to put back openbsd-netcat explicitly

Makes sense, I wonder what even pulled it in implicitly

@jelly jelly force-pushed the image-refresh-arch-20241104-111648 branch from 483ca45 to f99114a Compare November 4, 2024 13:47
@cockpituous cockpituous changed the title Image refresh for arch WIP: 731ec94ff5fd: [no-test] Image refresh for arch Nov 4, 2024
@cockpituous
Copy link
Contributor

image-refresh arch done: https://github.com/cockpit-project/bots/commits/image-refresh-arch-20241104-135936

@cockpituous
Copy link
Contributor

Success. Log: https://cockpit-logs.us-east-1.linodeobjects.com/image-refresh-arch-f99114a7-20241104-134741/log.html

@cockpituous cockpituous changed the title WIP: 731ec94ff5fd: [no-test] Image refresh for arch Image refresh for arch Nov 4, 2024
@cockpituous cockpituous changed the title Image refresh for arch WIP: aa5c3e77da0e: [no-test] Image refresh for arch Nov 4, 2024
@cockpituous
Copy link
Contributor

image-refresh arch done: https://github.com/cockpit-project/bots/commits/image-refresh-arch-20241104-155259

@cockpituous cockpituous changed the title WIP: aa5c3e77da0e: [no-test] Image refresh for arch Image refresh for arch Nov 4, 2024
@cockpituous
Copy link
Contributor

Success. Log: https://cockpit-logs.us-east-1.linodeobjects.com/image-refresh-arch-56075413-20241104-154059/log.html

@jelly jelly force-pushed the image-refresh-arch-20241104-111648 branch from d17a5ff to 2303455 Compare November 4, 2024 18:24
@cockpituous cockpituous changed the title Image refresh for arch WIP: 00f06acd6e0d: [no-test] Image refresh for arch Nov 4, 2024
@cockpituous
Copy link
Contributor

image-refresh arch done: https://github.com/cockpit-project/bots/commits/image-refresh-arch-20241104-183626

@cockpituous
Copy link
Contributor

Success. Log: https://cockpit-logs.us-east-1.linodeobjects.com/image-refresh-arch-23034550-20241104-182447/log.html

@cockpituous cockpituous changed the title WIP: 00f06acd6e0d: [no-test] Image refresh for arch Image refresh for arch Nov 4, 2024
jelly
jelly reviewed Nov 4, 2024
View reviewed changes
images/scripts/arch.setup Outdated
@@ -54,6 +55,7 @@ sudo \
vim \
firewalld \
openssh \
openbsd-netcat \
Copy link
Member

Choose a reason for hiding this comment

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

this is already in test_packages

@jelly
Copy link
Member Author

jelly commented Nov 4, 2024 

+ pacman -Rscn --noconfirm cloud-init
checking dependencies...
:: libvirt optionally requires openbsd-netcat: for remote management over ssh
:: python-pyparsing optionally requires python-jinja: for generating Railroad Diagrams
:: python-urllib3 optionally requires python-cryptography: security support

Packages (20) dhclient-4.4.3.P1-3  openbsd-netcat-1.226_1-3  python-attrs-23.2.0-3  python-cffi-1.17.1-1  python-cryptography-42.0.8-1  python-jinja-1:3.1.4-1  python-jsonpatch-1.33-2  python-jsonpointer-3.0.0-1  python-jsonschema-4.23.0-1  python-jsonschema-specifications-2023.12.1-2  python-markupsafe-2.1.5-2  python-netifaces-0.11.0-5  python-oauthlib-3.2.2-3  python-pycparser-2.22-2  python-pyserial-3.5-6  python-referencing-0.35.1-1  python-rpds-py-0.19.0-1  python-typing_extensions-4.12.2-1  run-parts-5.17-1  cloud-init-24.3.1-2

Total Removed Size:  25.64 MiB

:: Do you want to remove these packages? [Y/n] 
:: Processing package changes...
removing cloud-init...
removing python-typing_extensions...
removing python-pyserial...
removing python-oauthlib...
removing python-cryptography...
removing python-cffi...
removing python-pycparser...
removing python-netifaces...
removing python-jsonschema...
removing python-jsonschema-specifications...
removing python-referencing...
removing python-rpds-py...
removing python-attrs...
removing python-jsonpatch...
removing python-jsonpointer...
removing python-jinja...
removing python-markupsafe...
removing openbsd-netcat...

There is the problem.

@jelly jelly force-pushed the image-refresh-arch-20241104-111648 branch from 1f58aa8 to 2a23ced Compare November 5, 2024 09:17
@cockpituous cockpituous changed the title Image refresh for arch WIP: 429b8e0c6543: [no-test] Image refresh for arch Nov 5, 2024
@cockpituous
Copy link
Contributor

image-refresh arch done: https://github.com/cockpit-project/bots/commits/image-refresh-arch-20241105-092900

@cockpituous cockpituous changed the title WIP: 429b8e0c6543: [no-test] Image refresh for arch Image refresh for arch Nov 5, 2024
@cockpituous
Copy link
Contributor

Success. Log: https://cockpit-logs.us-east-1.linodeobjects.com/image-refresh-arch-2a23ced0-20241105-091736/log.html

@jelly jelly requested a review from martinpitt November 5, 2024 10:15
@jelly
Copy link
Member Author

jelly commented Nov 5, 2024

This is a massive yak-shave @martinpitt happy to further explain on Matrix

martinpitt
martinpitt requested changes Nov 5, 2024
View reviewed changes
Copy link
Member

@martinpitt martinpitt left a comment

Choose a reason for hiding this comment

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

Thanks! Indeed I have some questions.

images/scripts/arch.setup Outdated Show resolved Hide resolved
images/scripts/arch.setup Show resolved Hide resolved
images/scripts/arch.setup Show resolved Hide resolved
images/scripts/arch.setup Show resolved Hide resolved
jelly and others added 5 commits November 6, 2024 15:51
@jelly
images: add cockpit/podman to build depends for Arch Linux
5997635 
cockpit-podman and machines have podman as depends which during package
building is installed along with makedepends. As we didn't clean up
/var/cache/pacman/pkg before this was installed via the leftover package
cache.
@jelly
images: arch: remove cloud-init less aggressive
132295e 
Don't remove the dependencies of cloud-init for now as that will remove
openbsd-netcat as well which is a required test dependency. A more
proper fix would be to mark test dependencies as "explicitly required"
as this is quite invasive it needs proper testing.

For now work around by just removing cloud-init.
@jelly
images: drop package cache in the Arch image
dbbcf64 
pacman -Scc defaults to `no` in pacman, so `--noconfirm` does not remove
anything. So just manually get rid of all the cached packages in
/var/cache/pacman/pkg this saves ~ 600 MiB of space.
@jelly
images: Update arch image
9f077ec
@jelly
images: arch: add swtpm for cockpit-machines
728ba98 
For tests which add a TPM.
@jelly jelly force-pushed the image-refresh-arch-20241104-111648 branch from a906f32 to 728ba98 Compare November 6, 2024 14:51
@cockpituous cockpituous changed the title Image refresh for arch WIP: e914dbfc5bab: [no-test] Image refresh for arch Nov 6, 2024
@cockpituous
Copy link
Contributor

image-refresh arch done: https://github.com/cockpit-project/bots/commits/image-refresh-arch-20241106-150332

@cockpituous
Copy link
Contributor

Success. Log: https://cockpit-logs.us-east-1.linodeobjects.com/image-refresh-arch-728ba987-20241106-145210/log.html

@cockpituous cockpituous changed the title WIP: e914dbfc5bab: [no-test] Image refresh for arch Image refresh for arch Nov 6, 2024
martinpitt
martinpitt approved these changes Nov 6, 2024
View reviewed changes
Copy link
Member

@martinpitt martinpitt 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 adding swtpm!

A bit confusing to have two image refresh commits in this series, but 🤷‍♂️

@martinpitt
Copy link
Member

Ah, machines fails because TPM now works. Let me send a corresponding PR.

martinpitt added a commit to martinpitt/cockpit-machines that referenced this pull request Nov 7, 2024
@martinpitt
test: Expect TPM to work on Arch
948b103 
cockpit-project/bots#7063 adds `swtpm` to our
Arch image, with that TPM functionality now works.
@martinpitt martinpitt mentioned this pull request Nov 7, 2024
Merged
@martinpitt
Copy link
Member

@jelly Fixed in cockpit-project/cockpit-machines#1897 and green there, please land in lockstep.

martinpitt added a commit to cockpit-project/cockpit-machines that referenced this pull request Nov 7, 2024
@martinpitt
test: Expect TPM to work on Arch
e52aa0d 
cockpit-project/bots#7063 adds `swtpm` to our
Arch image, with that TPM functionality now works.
@martinpitt martinpitt merged commit 4ae47e3 into main Nov 7, 2024
11 of 12 checks passed
@martinpitt martinpitt deleted the image-refresh-arch-20241104-111648 branch November 7, 2024 08:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jelly jelly jelly left review comments

@martinpitt martinpitt martinpitt approved these changes

Assignees
No one assigned
Labels
bot no-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cockpituous @martinpitt @jelly