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

images: Build rhel-8-4 from official qcow image #1518

Merged
merged 2 commits into from
Jan 7, 2021

Conversation

martinpitt
Copy link
Member

@martinpitt martinpitt commented Jan 5, 2021

Starting from the cloud image is faster, more robust, and more realistic
(using an official product) than our own virt-install bootstrap.

Teach cloudimage.bootstrap to get along with redirects, as
download.devel.redhat.com is a geolocation mirror.

@martinpitt martinpitt added the bot label Jan 5, 2021
@cockpituous
Copy link
Contributor

image-refresh in progress on 3-ci-srv-01.
Log: https://logs.cockpit-project.org/logs/image-refresh-1518-20210105-063636/

@cockpituous cockpituous changed the title images: Build rhel-8-4 from official qcow image WIP: 3-ci-srv-01: [no-test] images: Build rhel-8-4 from official qcow image Jan 5, 2021
@cockpituous
Copy link
Contributor

@cockpituous cockpituous changed the title WIP: 3-ci-srv-01: [no-test] images: Build rhel-8-4 from official qcow image images: Build rhel-8-4 from official qcow image Jan 5, 2021
@martinpitt
Copy link
Member Author

The previous refresh took 1219s . Image size was 2.47 GB. This refresh took just 891 s and image size is roughly the same (2.46 GB).

@cockpituous cockpituous changed the title images: Build rhel-8-4 from official qcow image WIP: 2-cockpit-7: [no-test] images: Build rhel-8-4 from official qcow image Jan 5, 2021
@cockpituous cockpituous changed the title WIP: 2-cockpit-7: [no-test] images: Build rhel-8-4 from official qcow image images: Build rhel-8-4 from official qcow image Jan 5, 2021
@cockpituous cockpituous changed the title images: Build rhel-8-4 from official qcow image WIP: 2-cockpit-9: [no-test] images: Build rhel-8-4 from official qcow image Jan 5, 2021
@cockpituous cockpituous changed the title WIP: 2-cockpit-9: [no-test] images: Build rhel-8-4 from official qcow image images: Build rhel-8-4 from official qcow image Jan 5, 2021
@cockpit-project cockpit-project deleted a comment from cockpituous Jan 5, 2021
@cockpit-project cockpit-project deleted a comment from cockpituous Jan 5, 2021
@cockpit-project cockpit-project deleted a comment from cockpituous Jan 5, 2021
@cockpit-project cockpit-project deleted a comment from cockpituous Jan 5, 2021
@martinpitt
Copy link
Member Author

While the first image refresh still worked, the image now literally disappeared from the current compose. Blocking until they come back.

@martinpitt
Copy link
Member Author

I am temporarily putting back the initial (still slightly broken) image refresh so that I can test my cockpit-composer fix.

martinpitt pushed a commit to martinpitt/cockpit-composer that referenced this pull request Jan 5, 2021
Some of our images, like centos-8-stream, are already built from the official
cloud images instead of virt-install with LVM. More images are going to do that
soon [1], so fix vm.install to only do the LVM grow steps if the image actually
uses LVM.

[1] cockpit-project/bots#1518
@cockpituous cockpituous changed the title images: Build rhel-8-4 from official qcow image WIP: 4-ci-srv-06: [no-test] images: Build rhel-8-4 from official qcow image Jan 5, 2021
@cockpituous
Copy link
Contributor

image-refresh in progress on 4-ci-srv-06.
Log: https://logs.cockpit-project.org/logs/image-refresh-1518-20210105-152121/

@cockpituous
Copy link
Contributor

@cockpituous cockpituous changed the title WIP: 4-ci-srv-06: [no-test] images: Build rhel-8-4 from official qcow image images: Build rhel-8-4 from official qcow image Jan 5, 2021
martinpitt pushed a commit to osbuild/cockpit-composer that referenced this pull request Jan 5, 2021
Some of our images, like centos-8-stream, are already built from the official
cloud images instead of virt-install with LVM. More images are going to do that
soon [1], so fix vm.install to only do the LVM grow steps if the image actually
uses LVM.

[1] cockpit-project/bots#1518
@martinpitt
Copy link
Member Author

Apparently we lost /etc/crypttab on the image, and we need to adjust our tests or even the code to get along without it. Or bring back cryptsetup onto the image, I need to check this locally.

martinpitt and others added 2 commits January 6, 2021 10:29
Starting from the cloud image is faster, more robust, and more realistic
(using an official product) than our own virt-install bootstrap.

Teach cloudimage.bootstrap to get along with redirects, as
download.devel.redhat.com is a geolocation mirror.

The cloud images don't ship an empty /etc/crypttab, which uncovered a
bug in our storage page or in udisks:
cockpit-project/cockpit#15100
Create an empy file in the install script to work around that for now.
@martinpitt martinpitt marked this pull request as ready for review January 6, 2021 09:37
@martinpitt
Copy link
Member Author

I reported the crypttab failure as cockpit-project/cockpit#15100 , this is real -- this kinda shows the point of testing this on more variety of image types. This should be green now, ready for review.

@martinpitt
Copy link
Member Author

There is one remaining test case failure as this new image does not have swap. I sent a fix for that to cockpit-project/cockpit#15104

@marusak
Copy link
Member

marusak commented Jan 7, 2021

All landed, unblocked

@martinpitt martinpitt removed the blocked label Jan 7, 2021
martinpitt pushed a commit to martinpitt/cockpit-composer that referenced this pull request Jan 7, 2021
Some of our images, like centos-8-stream, are already built from the official
cloud images instead of virt-install with LVM. More images are going to do that
soon [1], so fix vm.install to only do the LVM grow steps if the image actually
uses LVM.

[1] cockpit-project/bots#1518

Cherry-picked from master commit d1fa01f
Copy link
Member

@marusak marusak left a comment

Choose a reason for hiding this comment

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

Nice one, thanks!

@martinpitt martinpitt merged commit 0097003 into cockpit-project:master Jan 7, 2021
@martinpitt martinpitt deleted the r84-cloud branch January 7, 2021 09:57
henrywang pushed a commit to osbuild/cockpit-composer that referenced this pull request Jan 8, 2021
Some of our images, like centos-8-stream, are already built from the official
cloud images instead of virt-install with LVM. More images are going to do that
soon [1], so fix vm.install to only do the LVM grow steps if the image actually
uses LVM.

[1] cockpit-project/bots#1518

Cherry-picked from master commit d1fa01f
jkozol pushed a commit to jkozol/welder-web that referenced this pull request Jan 8, 2021
Some of our images, like centos-8-stream, are already built from the official
cloud images instead of virt-install with LVM. More images are going to do that
soon [1], so fix vm.install to only do the LVM grow steps if the image actually
uses LVM.

[1] cockpit-project/bots#1518

Cherry-picked from master commit d1fa01f
jkozol pushed a commit to jkozol/welder-web that referenced this pull request Jan 8, 2021
Some of our images, like centos-8-stream, are already built from the official
cloud images instead of virt-install with LVM. More images are going to do that
soon [1], so fix vm.install to only do the LVM grow steps if the image actually
uses LVM.

[1] cockpit-project/bots#1518

Cherry-picked from master commit d1fa01f
jkozol pushed a commit to jkozol/welder-web that referenced this pull request Jan 8, 2021
Some of our images, like centos-8-stream, are already built from the official
cloud images instead of virt-install with LVM. More images are going to do that
soon [1], so fix vm.install to only do the LVM grow steps if the image actually
uses LVM.

[1] cockpit-project/bots#1518

Cherry-picked from master commit d1fa01f
martinpitt added a commit to weldr/lorax that referenced this pull request Jan 8, 2021
Some of our images, like centos-8-stream, are already built from the
official cloud images instead of virt-install with LVM. More images are
going to do that soon [1][2], so fix vm.install to only do the LVM grow
steps if the image actually uses LVM.

Also adjust the comment, as commit 6ddaa5e fixed this for
RHEL images.

[1] cockpit-project/bots#1518
[2] cockpit-project/bots#1527
martinpitt added a commit to weldr/lorax that referenced this pull request Jan 8, 2021
Some of our images, like centos-8-stream, are already built from the
official cloud images instead of virt-install with LVM. More images are
going to do that soon [1][2], so fix vm.install to only do the LVM grow
steps if the image actually uses LVM.

Also adjust the comment, as commit 6ddaa5e fixed this for
RHEL images.

[1] cockpit-project/bots#1518
[2] cockpit-project/bots#1527

(cherry-picked from commit 04ce221)
bcl pushed a commit to weldr/lorax that referenced this pull request Feb 8, 2021
Some of our images, like centos-8-stream, are already built from the
official cloud images instead of virt-install with LVM. More images are
going to do that soon [1][2], so fix vm.install to only do the LVM grow
steps if the image actually uses LVM.

Also adjust the comment, as commit 6ddaa5e fixed this for
RHEL images.

[1] cockpit-project/bots#1518
[2] cockpit-project/bots#1527

(cherry picked from commit 04ce221)
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.

None yet

3 participants