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

Use packaged Fedora IoT remote configuration #95

Merged
merged 3 commits into from
Nov 20, 2023

Conversation

achilleas-k
Copy link
Member

@achilleas-k achilleas-k commented Aug 8, 2023

Migration of osbuild/osbuild-composer#3488.

The default Fedora IoT remote is packaged in the fedora-iot-config package. This PR removes the ostree remote config we hard coded for the iot-raw-image (and associated image types iot-qcow2-image and iot-simplified-installer) and installs the package in the iot-commit, which means every Fedora IoT build (both commit and container) are configured using the package.

@achilleas-k achilleas-k added the WIP+test Work in progress but run Gitlab CI. label Aug 8, 2023
@achilleas-k achilleas-k mentioned this pull request Aug 8, 2023
14 tasks
@achilleas-k achilleas-k marked this pull request as ready for review August 17, 2023 11:28
@achilleas-k achilleas-k removed the WIP+test Work in progress but run Gitlab CI. label Aug 17, 2023
@yih-redhat
Copy link
Contributor

Hi @achilleas-k,
Does this pr fix any issue of Fedora Iot Remote? I didn't see anything special in our test script to test or configure Fedora Iot Remote, could you please explain more how this pr will impact our test script for iot-raw-image (and also the iot-simplified-installer and iot-qcow2-image) ?
What test scenario will you suggest us to add into our test script? or just run current test script, and if it pass then this pr is ok to merge? Thanks.

@achilleas-k
Copy link
Member Author

The purpose of this PR is to configure the default remote for the image by installing an RPM that's managed by the Fedora IoT team rather than having it as part of the image definition. This is similar to how RPM repositories are configured in RPM-based images: we don't configure repositories ourselves, but they are packaged and distributed by the distribution and we install them in our images.

I'm not sure we need to test that a particular remote configuration is present. Perhaps we can have a check that there is a remote configured (any remote). But more specifically, there was an issue the last time we tried to make this change that blocked us [1]. The tests we have in osbuild-composer were failing when setting up a custom remote in order to test the upgrade commit. We still haven't figured out what's causing this issue and how the change affects it.

[1] osbuild/osbuild-composer#3488

@github-actions
Copy link

github-actions bot commented Oct 7, 2023

This PR is stale because it has been open 30 days with no activity. Remove "Stale" label or comment or this will be closed in 7 days.

@miabbott
Copy link

@paulwhalen you were looking at this from the Fedora side, right?

@cgwalters
Copy link
Contributor

In ostreedev/ostree#3079 I believe

@pcdubs
Copy link

pcdubs commented Oct 23, 2023

@paulwhalen you were looking at this from the Fedora side, right?

Yes, working on the iot-installer portion to add to this.

@achilleas-k
Copy link
Member Author

The remote issue should be fixed now!

pkg/image/ostree_disk.go Outdated Show resolved Hide resolved
Add the same comment that we have in the osbuild stage schema.
The default remote is packaged in the fedora-iot-config rpm and
configured for all fedora-iot images.  Remove the static configuration
from iot-raw-image, iot-qcow2-image, and iot-simplified-installer.

Keep the remote name set so that the deploy stage sets the remote to
track for the deployment.
When we want the source URL to be set as the remote for the system, we
define it at the distro level.  In the pipeline, if no remote URL is
set, don't add a remote stage at all.
Copy link
Member

@supakeen supakeen left a comment

Choose a reason for hiding this comment

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

Awesome.

@achilleas-k
Copy link
Member Author

I'm going to merge this and move on to getting it into osbuild-composer. My local tests worked so we'll have to catch any other issues in CI there.

@achilleas-k achilleas-k added this pull request to the merge queue Nov 20, 2023
Merged via the queue into osbuild:main with commit f57c88d Nov 20, 2023
9 checks passed
@achilleas-k achilleas-k deleted the iot-remote branch November 21, 2023 11:40
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.

7 participants