switch to images/pkg/dnfjson and remove internal copy #3828

diaasami · 2023-11-30T10:25:40Z

https://issues.redhat.com/browse/COMPOSER-2068

This pull request includes:

adequate testing for the new functionality or fixed issue
adequate documentation informing people about the change such as
- submit a PR for the guides repository if this PR changed any behavior described there: https://www.osbuild.org/guides/

bcl · 2023-11-30T20:40:37Z

Looks ok to me other than what the linter caught, and it looks like a test that runs on ./internal/dnfjson/ needs to be removed (I checked images and the same test already exists there).

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD a58c770 with the main merge-base 2a6bad7). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5673560220/artifacts/browse

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD a58c770 with the main merge-base 2a6bad7). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5673561227/artifacts/browse

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 96eecda with the main merge-base 7deaa29). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5674477387/artifacts/browse

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 96eecda with the main merge-base 7deaa29). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5674478529/artifacts/browse

.github/workflows/tests.yml

osbuild-composer.spec

achilleas-k · 2024-01-10T17:42:34Z

Module hotfixes tests are failing. I think it might be another pointer aliasing issue in osbuild/images here: https://github.com/osbuild/images/blob/d04b0ff615ea2615cea9207b0e5741d4efd5389a/pkg/dnfjson/dnfjson.go#L276-L289

achilleas-k

Failing tests.

diaasami · 2024-02-14T16:56:15Z

After rebasing, some tests are failing with:

nothing provides osbuild-depsolve-dnf >= 107

the ones I have checked were using rhel8

COMPOSER-2068

To avoid incompatibility between older image-info and latest osbuild

thozza · 2024-02-19T09:38:33Z

Hey @henrywang. I can see failure in Tests / edge-commit-cs9, which does not seem likely to be the result of changes in this PR:

TASK [check ostree-remount mount log] ******************************************
changed: [192.168.100.50] => {"changed": true, "cmd": ["journalctl", "-u", "ostree-remount"], "delta": "0:00:00.006427", "end": "2024-02-17 22:09:48.184964", "msg": "", "rc": 0, "start": "2024-02-17 22:09:48.178537", "stderr": "", "stderr_lines": [], "stdout": "Feb 17 22:00:15 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...\nFeb 17 22:00:15 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts.\n-- Boot 0216e5dcba04487fb70e15291439d0b9 --\nFeb 17 22:00:42 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...\nFeb 17 22:00:42 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts.\n-- Boot 34f5b1da20544a8cbee5e9e790a05581 --\nFeb 17 22:09:30 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...\nFeb 17 22:09:30 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts.", "stdout_lines": ["Feb 17 22:00:15 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...", "Feb 17 22:00:15 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts.", "-- Boot 0216e5dcba04487fb70e15291439d0b9 --", "Feb 17 22:00:42 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...", "Feb 17 22:00:42 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts.", "-- Boot 34f5b1da20544a8cbee5e9e790a05581 --", "Feb 17 22:09:30 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...", "Feb 17 22:09:30 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts."]}

TASK [assert] ******************************************************************
fatal: [192.168.100.50]: FAILED! => {
    "assertion": "'/sysroot' in result_remount_jounalctl.stdout",
    "changed": false,
    "evaluated_to": false,
    "msg": "/sysroot or /var are not remounted by ostree-remount"
}

Is this a known issue?

henrywang · 2024-02-19T12:49:58Z

Hey @henrywang. I can see failure in Tests / edge-commit-cs9, which does not seem likely to be the result of changes in this PR:

TASK [check ostree-remount mount log] ******************************************
changed: [192.168.100.50] => {"changed": true, "cmd": ["journalctl", "-u", "ostree-remount"], "delta": "0:00:00.006427", "end": "2024-02-17 22:09:48.184964", "msg": "", "rc": 0, "start": "2024-02-17 22:09:48.178537", "stderr": "", "stderr_lines": [], "stdout": "Feb 17 22:00:15 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...\nFeb 17 22:00:15 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts.\n-- Boot 0216e5dcba04487fb70e15291439d0b9 --\nFeb 17 22:00:42 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...\nFeb 17 22:00:42 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts.\n-- Boot 34f5b1da20544a8cbee5e9e790a05581 --\nFeb 17 22:09:30 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...\nFeb 17 22:09:30 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts.", "stdout_lines": ["Feb 17 22:00:15 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...", "Feb 17 22:00:15 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts.", "-- Boot 0216e5dcba04487fb70e15291439d0b9 --", "Feb 17 22:00:42 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...", "Feb 17 22:00:42 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts.", "-- Boot 34f5b1da20544a8cbee5e9e790a05581 --", "Feb 17 22:09:30 localhost systemd[1]: Starting OSTree Remount OS/ Bind Mounts...", "Feb 17 22:09:30 localhost systemd[1]: Finished OSTree Remount OS/ Bind Mounts."]}

TASK [assert] ******************************************************************
fatal: [192.168.100.50]: FAILED! => {
    "assertion": "'/sysroot' in result_remount_jounalctl.stdout",
    "changed": false,
    "evaluated_to": false,
    "msg": "/sysroot or /var are not remounted by ostree-remount"
}

Is this a known issue?

Yes, it's a know issue. This failure is not related with this PR. I'm working on it now.

The RHEL nightly composes still contain old osbuild-composer version, which does not have an explicit dependency on osbuild-depsolve-dnf package. As a result, running the latest upstream base_tests.sh on RHEL nightly composes fails due to osbuild-depsolve-dnf not being installed. Workaround this in the test case by explicitly installing the osbuild-depsolve-dnf package in case the osbuild-composer version is lower than the one which has an explicit dependency on osbuild-depsolve-dnf. Signed-off-by: Tomáš Hozza <thozza@redhat.com>

thozza

LGTM

thozza · 2024-02-20T14:55:43Z

The failure in the edge test case is a known issue, as confirmed by #3828 (comment).

The failure in the nightly pipeline is a known issue, tracked in https://issues.redhat.com/browse/RHEL-24346

diaasami force-pushed the use_dnfjson_pkg branch 2 times, most recently from 207c040 to 59165de Compare November 30, 2023 14:23

diaasami force-pushed the use_dnfjson_pkg branch 4 times, most recently from 1ea084f to a58c770 Compare December 4, 2023 11:41

schutzbot reviewed Dec 4, 2023

View reviewed changes

diaasami force-pushed the use_dnfjson_pkg branch from a58c770 to 96eecda Compare December 4, 2023 13:29

schutzbot reviewed Dec 4, 2023

View reviewed changes

thozza reviewed Dec 6, 2023

View reviewed changes

.github/workflows/tests.yml Show resolved Hide resolved

diaasami force-pushed the use_dnfjson_pkg branch 2 times, most recently from ae3eda9 to b908867 Compare December 7, 2023 11:25

diaasami force-pushed the use_dnfjson_pkg branch from b908867 to bfd7a92 Compare December 22, 2023 21:48

ondrejbudai reviewed Jan 2, 2024

View reviewed changes

osbuild-composer.spec Show resolved Hide resolved

thozza reviewed Jan 2, 2024

View reviewed changes

osbuild-composer.spec Outdated Show resolved Hide resolved

thozza reviewed Jan 2, 2024

View reviewed changes

osbuild-composer.spec Outdated Show resolved Hide resolved

diaasami force-pushed the use_dnfjson_pkg branch 5 times, most recently from d4d6140 to 9e30ba2 Compare January 4, 2024 14:49

achilleas-k mentioned this pull request Jan 5, 2024

osbuild.spec: depsolve-dnf obsoletes composer-dnf-json osbuild/osbuild#1524

Closed

diaasami force-pushed the use_dnfjson_pkg branch 2 times, most recently from 5a9aa90 to 0025194 Compare January 8, 2024 16:24

achilleas-k self-requested a review January 9, 2024 20:11

achilleas-k requested changes Jan 22, 2024

View reviewed changes

diaasami force-pushed the use_dnfjson_pkg branch 2 times, most recently from ac18eab to 3acfe1d Compare February 12, 2024 21:32

mcattamoredhat mentioned this pull request Feb 13, 2024

edge-commit CS9 failure: ostree-remount.service fails to remount /sysroot and /var mountpoints #3942

Open

diaasami force-pushed the use_dnfjson_pkg branch 2 times, most recently from c388cc3 to 2e80344 Compare February 14, 2024 14:31

diaasami force-pushed the use_dnfjson_pkg branch 6 times, most recently from 2443ff9 to 3eff6b8 Compare February 16, 2024 11:41

diaasami added 2 commits February 16, 2024 15:31

Schutzfile: bump version of osbuild to 619a64f0

4f91d8d

switch to images/pkg/dnfjson and remove internal copy

09478b7

COMPOSER-2068

diaasami force-pushed the use_dnfjson_pkg branch from 3eff6b8 to f451dc1 Compare February 16, 2024 14:32

achilleas-k previously approved these changes Feb 16, 2024

View reviewed changes

diaasami dismissed achilleas-k’s stale review via a2901ad February 16, 2024 16:33

diaasami force-pushed the use_dnfjson_pkg branch 3 times, most recently from 251a397 to ba6239a Compare February 16, 2024 23:01

Test/old-worker-new-composer: use latest composer for verification

d932a80

To avoid incompatibility between older image-info and latest osbuild

diaasami force-pushed the use_dnfjson_pkg branch from ba6239a to d932a80 Compare February 17, 2024 03:26

thozza approved these changes Feb 20, 2024

View reviewed changes

thozza merged commit 218a784 into osbuild:main Feb 20, 2024
74 of 76 checks passed

diaasami deleted the use_dnfjson_pkg branch February 20, 2024 15:01

thozza mentioned this pull request Feb 21, 2024

Add minimal-raw and clean up the compose handler a bit #3962

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

switch to images/pkg/dnfjson and remove internal copy #3828

switch to images/pkg/dnfjson and remove internal copy #3828

diaasami commented Nov 30, 2023 •

edited

Loading

bcl commented Nov 30, 2023

schutzbot left a comment

schutzbot left a comment

schutzbot left a comment

schutzbot left a comment

achilleas-k commented Jan 10, 2024 •

edited

Loading

achilleas-k left a comment

diaasami commented Feb 14, 2024 •

edited

Loading

thozza commented Feb 19, 2024

henrywang commented Feb 19, 2024

thozza left a comment

thozza commented Feb 20, 2024

switch to images/pkg/dnfjson and remove internal copy #3828

switch to images/pkg/dnfjson and remove internal copy #3828

Conversation

diaasami commented Nov 30, 2023 • edited Loading

bcl commented Nov 30, 2023

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

achilleas-k commented Jan 10, 2024 • edited Loading

achilleas-k left a comment

Choose a reason for hiding this comment

diaasami commented Feb 14, 2024 • edited Loading

thozza commented Feb 19, 2024

henrywang commented Feb 19, 2024

thozza left a comment

Choose a reason for hiding this comment

thozza commented Feb 20, 2024

diaasami commented Nov 30, 2023 •

edited

Loading

achilleas-k commented Jan 10, 2024 •

edited

Loading

diaasami commented Feb 14, 2024 •

edited

Loading