Skip to content

RHEL-9: Fix download of stage2 image from .treeinfo#6367

Merged
jkonecny12 merged 7 commits intorhinstaller:rhel-9from
jkonecny12:rhel-9-fix-updir-unified-iso
May 13, 2025
Merged

RHEL-9: Fix download of stage2 image from .treeinfo#6367
jkonecny12 merged 7 commits intorhinstaller:rhel-9from
jkonecny12:rhel-9-fix-updir-unified-iso

Conversation

@jkonecny12
Copy link
Copy Markdown
Member

@jkonecny12 jkonecny12 commented Apr 22, 2025

This is fix to enable downloading stage2 image from a non default place with .treeinfo file. If .treeinfo has a path to the stage2 image it will be used as the first variant, in case this will fail it will fallback to default paths.

This is fixing a few parts:

  • Reading values from configuration file (.treeinfo and .buildstamp).
  • Fix issue that curl is not able to understand // in the path.
  • Fix documentation

Backport of #5773
Resolves: RHEL-48837

@jkonecny12
Copy link
Copy Markdown
Member Author

Manual testing required.

Copy link
Copy Markdown

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @jkonecny12 - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider adding a comment explaining why the whitespace trimming is necessary in config_get.
  • The unit test file should be located in the same directory as the script being tested.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟡 Testing: 3 issues found
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Comment thread tests/unit_tests/shell_tests/test_dracut_anaconda-lib.py
Comment thread tests/unit_tests/shell_tests/test_dracut_anaconda-lib.py
Comment thread tests/unit_tests/shell_tests/test_dracut_anaconda-lib.py
@jkonecny12 jkonecny12 added the ready to merge The PR can be merged. It should have all BZ flags required for releasing set (usually release+). label Apr 22, 2025
@jkonecny12
Copy link
Copy Markdown
Member Author

/kickstart-test --testtype smoke

@jkonecny12 jkonecny12 removed the ready to merge The PR can be merged. It should have all BZ flags required for releasing set (usually release+). label Apr 22, 2025
@jkonecny12
Copy link
Copy Markdown
Member Author

/kickstart-test --testtype smoke

With commit 0785531 the `get_config`
function in anaconda-lib.sh was broken because missing quotes removed
leading and trailing whitespace characters automatically but after the
fix in commit mentioned above this side effect was fixed which lead in
broken code. In other words the key were never matched because of
trailing whitespace.

Issue raised by this is not being able to read .treeinfo and .buildstamp
files in Dracut. Example of such situation is broken boot when stage2
image is stored under special path mentioned in .treeinfo file.

(cherry picked from commit 2336ba8)
Related: RHEL-48837
In Dracut the URL concatenation from .treeinfo could also point you to
directory above by `..`. However, if the `inst.repo=` argument was
set with trailing `/` it will create URL which is not supported by curl.

Supported:
`os/../BaseOS/`
Unsupported by curl:
`os//../BaseOS/`

Remove the trailing `/` to avoid this issue.

(cherry picked from commit 5cb0300)
Resolves: RHEL-48837
This commit will also add code to enable testing of the Dracut shell
scripts.

(cherry picked from commit 69da1b4)
Related: RHEL-48837
Dracut testing should be more versatile with this approach. This is more
an extension for future testing.

(cherry picked from commit 29debf1)

Related: RHEL-48837
For better visibility that we have such a tests.

(cherry picked from commit 7e9ed4e)

Related: RHEL-48837
- Remove outdated parts
- Fix minor issues
- Add missing parts
- Improve security topics

Related: RHEL-48837
@jkonecny12 jkonecny12 force-pushed the rhel-9-fix-updir-unified-iso branch from 579e95b to 3292977 Compare April 24, 2025 16:12
@jkonecny12
Copy link
Copy Markdown
Member Author

/kickstart-test --testtype smoke

@jkonecny12 jkonecny12 added the ready to merge The PR can be merged. It should have all BZ flags required for releasing set (usually release+). label Apr 28, 2025
@jkonecny12 jkonecny12 merged commit e517215 into rhinstaller:rhel-9 May 13, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready to merge The PR can be merged. It should have all BZ flags required for releasing set (usually release+). rhel-9

Development

Successfully merging this pull request may close these issues.

2 participants