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

targets: Add missing fields to TufCustom #441

Merged
merged 1 commit into from
Nov 13, 2024

Conversation

detsch
Copy link
Member

@detsch detsch commented Nov 11, 2024

The fioctl targets add command must retain the arch and image-file custom fields from the previous target. Otherwise, the publish-compose-apps operation for new targets will fail.

This commit adds both field to the structure used in the process, allowing the required fields to be copied to the target being added.


@mike-sul after some additional tests with targets creation, it is clear that this change is in fact required.

The `fioctl targets add` command must retain the arch and image-file
custom fields from the previous target. Otherwise, the
publish-compose-apps operation for new targets will fail.

This commit adds both field to the structure used in the process,
allowing the required fields to be copied to the target being added.

Signed-off-by: Andre Detsch <andre.detsch@foundries.io>
@vkhoroz vkhoroz requested a review from mike-sul November 11, 2024 20:46
@mike-sul mike-sul self-requested a review November 12, 2024 10:27
@mike-sul
Copy link
Contributor

mike-sul commented Nov 12, 2024

@detsch This change LGTM, and it fixes the issue you have in mind. I would use this PR to fix another related issue - the origUri field is not set in the produced "app" target if the source target(s) is(are) produced by FIO CI LmP build. As result, fioctl targets offline-update cannot download ostree repo.

So, I think we should set orgUri in createAppTargets (just copy value of uri) and set uri to empty value or remove it all for both ostree and apps cases since a target is not produced by Fio CI.

@mike-sul
Copy link
Contributor

@detsch Let's rebase and merge it, and the orgUri issue can be addressed in another PR then.

@detsch detsch merged commit acb6e84 into foundriesio:main Nov 13, 2024
8 checks passed
@detsch detsch deleted the detsch-targets-add-extra-fields branch November 13, 2024 13:42
@mike-sul
Copy link
Contributor

@vkhoroz It would be great to include this commit into the upcoming release too.

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.

2 participants