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/fedora: Tweaks and tests #1384

Merged

Conversation

debarshiray
Copy link
Member

@debarshiray debarshiray commented Oct 4, 2023

No description provided.

debarshiray added a commit to debarshiray/toolbox that referenced this pull request Oct 4, 2023
@debarshiray debarshiray force-pushed the wip/rishi/images-fedora-reorder-whois branch from 7b29e5d to 50126cd Compare October 4, 2023 16:11
@softwarefactory-project-zuul
Copy link

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/8fc7fd117aa444fc8987a9991c0f6500

✔️ unit-test SUCCESS in 13m 10s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 5m 55s
✔️ unit-test-restricted SUCCESS in 8m 43s
system-test-fedora-rawhide FAILURE in 47m 10s
✔️ system-test-fedora-38 SUCCESS in 39m 21s
✔️ system-test-fedora-37 SUCCESS in 37m 53s

Until now, only the packages that are present in the fedora base image,
and had their documentation stripped out, were being tested for the
availability of documentation.  There were no tests for the extra
packages that get added to the base image to form the fedora-toolbox
image.

The util-linux and xz packages were picked as examples for these new
tests.  The xz package is a particularly good example because it has
translations for its manuals.  It can help test that the fedora-toolbox
image is localized just like Fedora Silverblue and Workstation.

Only the images for currently maintained Fedoras (ie., 37, 38 and 39)
were updated.

containers#1384
@debarshiray debarshiray force-pushed the wip/rishi/images-fedora-reorder-whois branch from 50126cd to 20188a0 Compare October 9, 2023 11:13
@debarshiray debarshiray changed the title images/fedora: Reorder alphabetically images/fedora: Tweaks and tests Oct 9, 2023
@softwarefactory-project-zuul
Copy link

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/8883b439a5b04954895ff0ecf2bf2dad

✔️ unit-test SUCCESS in 8m 13s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 56s
✔️ unit-test-restricted SUCCESS in 7m 17s
system-test-fedora-rawhide FAILURE in 34m 58s
system-test-fedora-39 FAILURE in 34m 19s
✔️ system-test-fedora-38 SUCCESS in 24m 17s
✔️ system-test-fedora-37 SUCCESS in 23m 59s

@debarshiray
Copy link
Member Author

There are still some test failures on Fedora Rawhide and Fedora 39.

For example, these that seem to be because of changes in various other components in Fedora:

fedora-rawhide | not ok 3 help: Run command 'help' in 145ms
fedora-rawhide | # (from function `assert_line' in file test/system/libs/bats-assert/src/assert.bash, line 479,
fedora-rawhide | #  in test file test/system/002-help.bats, line 45)
fedora-rawhide | #   `assert_line --index 0 --partial "toolbox(1)"' failed
fedora-rawhide | # /usr/bin/man
fedora-rawhide | #
fedora-rawhide | # -- line does not contain substring --
fedora-rawhide | # index     : 0
fedora-rawhide | # substring : toolbox(1)
fedora-rawhide | # line      : troff:<standard input>:33: warning: cannot select font 'C'
fedora-rawhide | # --

However, at least these two failures are a fallout from the Fedora 39 Change that made the fedora-toolbox:39 and above images to be generated as part of the nightly composes:

fedora-rawhide | not ok 82 list: Default image in 39783ms
fedora-rawhide | # (from function `assert_line' in file test/system/libs/bats-assert/src/assert.bash, line 479,
fedora-rawhide | #  in test file test/system/102-list.bats, line 99)
fedora-rawhide | #   `assert_line --index 1 --partial "$default_image"' failed
fedora-rawhide | #
fedora-rawhide | # -- line does not contain substring --
fedora-rawhide | # index     : 1
fedora-rawhide | # substring : registry.fedoraproject.org/fedora-toolbox:40
fedora-rawhide | # line      :
fedora-rawhide | # --
fedora-rawhide | #
fedora-rawhide | not ok 83 list: Default image (using --images) in 39062ms
fedora-rawhide | # (from function `assert_line' in file test/system/libs/bats-assert/src/assert.bash, line 479,
fedora-rawhide | #  in test file test/system/102-list.bats, line 117)
fedora-rawhide | #   `assert_line --index 1 --partial "$default_image"' failed
fedora-rawhide | #
fedora-rawhide | # -- line does not contain substring --
fedora-rawhide | # index     : 1
fedora-rawhide | # substring : registry.fedoraproject.org/fedora-toolbox:40
fedora-rawhide | # line      :
fedora-rawhide | # --
fedora-rawhide | #

The images are now built with Image Factory with Kickstarts and Pungi instead of with OpenShift Build Service cluster from Dockerfiles. During that migration we lost the com.github.containers.toolbox LABEL from the images and they no longer show up as Toolbx images.

I submitted some pull requests to address that:

In the mean time, while we track down and fix these failures, I am going to temporarily override these failures.

@debarshiray debarshiray merged commit 20188a0 into containers:main Oct 9, 2023
2 of 3 checks passed
@debarshiray debarshiray deleted the wip/rishi/images-fedora-reorder-whois branch October 9, 2023 14:07
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Oct 19, 2023
It's currently being pulled in as a dependency of iproute.  However,
since it's explicitly mentioned in the list of default packages on
Fedora Silverblue and Workstation [1], it should be mentioned here too.

The psmisc package marks the translations for its manuals with %lang().
Therefore, it's a very good example for testing that the fedora-toolbox
image is localized just like Fedora Silverblue and Workstation.

This is unlike the xz package, whose translations for manuals were added
to the tests recently [2].  The xz package doesn't mark its translated
manuals with %lang() [3], which means that they are going to get
installed regardless of whether RPM has been configured to not install
localization files or not.  eg., through the %_install_langs macro.  So,
they aren't a good candidate for the tests until this is fixed.

[1] fedora-comps commit e4ed54dfcc497fd0
    https://pagure.io/fedora-comps/c/e4ed54dfcc497fd0
    https://pagure.io/fedora-comps/pull-request/379

[2] Commit 20188a0
    containers@20188a097a1a7a16
    containers#1384

[3] https://src.fedoraproject.org/rpms/xz/pull-request/10
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Oct 19, 2023
It's currently being pulled in as a dependency of iproute.  However,
since it's explicitly mentioned in the list of default packages on
Fedora Silverblue and Workstation [1], it should be mentioned here too.

The psmisc package marks the translations for its manuals with %lang().
Therefore, it's a very good example for testing that the fedora-toolbox
image is localized just like Fedora Silverblue and Workstation.

This is unlike the xz package, whose translations for manuals were added
to the tests recently [2].  The xz package doesn't mark its translated
manuals with %lang() [3], which means that they are going to get
installed regardless of whether RPM has been configured to not install
localization files or not.  eg., through the %_install_langs macro.  So,
they aren't a good candidate for the tests until this is fixed.

[1] fedora-comps commit e4ed54dfcc497fd0
    https://pagure.io/fedora-comps/c/e4ed54dfcc497fd0
    https://pagure.io/fedora-comps/pull-request/379

[2] Commit 20188a0
    containers@20188a097a1a7a16
    containers#1384

[3] https://src.fedoraproject.org/rpms/xz/pull-request/10

containers#1390
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

1 participant