Skip to content

Fixes for smaller issues - #192

Merged
safl merged 5 commits into
refenv:mainfrom
naddinadja:config
Sep 20, 2025
Merged

Fixes for smaller issues#192
safl merged 5 commits into
refenv:mainfrom
naddinadja:config

Conversation

@naddinadja

@naddinadja naddinadja commented Aug 29, 2025

Copy link
Copy Markdown
Contributor

Fixes for:

  • Multiple configs overwriting eachother: merge dicts recursively
  • UNIX assumption in Guest.wrapper: allow definition of boot-driver

Added:

  • Script for waiting for guest SSH to be ready, should solve Script to wait for ssh to be ready #194
  • "copy" button in report which lets you copy the commands to the clipboard, so you don't have to mark it yourself.

@naddinadja
naddinadja requested a review from safl August 29, 2025 10:41
If multiple configs were given and more than one defined a subkey of the
same dict, the whole key would be overwritten. Example:

[foo]
bar = 1
baz = 2

[foo]
bar = 3

This would overwrite the whole `foo` dictionary, removing the `baz` key
which is not the intuitive.

With this fix, the toml files are recursively merged so only specified
keys in subsequent config files are overwritten (or added if not defined
in the first config).

Signed-off-by: Nadja Brix Koch <n.koch@samsung.com>
@coveralls

coveralls commented Aug 29, 2025

Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 17860027532

Details

  • 25 of 34 (73.53%) changed or added relevant lines in 3 files are covered.
  • 21 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-1.2%) to 78.474%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/cijoe/qemu/scripts/guest_wait_for_ssh.py 15 24 62.5%
Files with Coverage Reduction New Missed Lines %
src/cijoe/core/resources.py 1 86.34%
src/cijoe/cli/cli.py 20 80.17%
Totals Coverage Status
Change from base Build 15921306756: -1.2%
Covered Lines: 1567
Relevant Lines: 2060

💛 - Coveralls

@naddinadja naddinadja changed the title fix(cli/config): merge configs when multiple are given Fixes for smaller issues Sep 9, 2025
@naddinadja
naddinadja force-pushed the config branch 2 times, most recently from d1832eb to 390bada Compare September 9, 2025 12:13
This script waits for the SSH to be ready in a qemu guest. This is
useful if a guest is started without the provided `qemu.guest_start`
script.

Signed-off-by: Nadja Brix Koch <n.koch@samsung.com>
Signed-off-by: Nadja Brix Koch <n.koch@samsung.com>
Windows qcow2 images do not use the virtio-blk-pci driver for booting
virtual machines so this commit allows the user to define a boot driver
under the key `qemu.guests.<name>.boot_driver`, and defaults to the
original `virtio-blk-pci` driver if none is specified.

Signed-off-by: Nadja Brix Koch <n.koch@samsung.com>
@naddinadja
naddinadja force-pushed the config branch 7 times, most recently from e3755a9 to aca85c8 Compare September 19, 2025 13:29
This is necessary for the debian arm image to not rerun cloud-init
again and again in the qemu.guest_aarch64 example.

Signed-off-by: Nadja Brix Koch <n.koch@samsung.com>

@safl safl left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This is great!l functionality and a very nice fix on cloud-init. Lgtm!

@safl
safl merged commit 496d9ae into refenv:main Sep 20, 2025
26 checks passed
@naddinadja
naddinadja deleted the config branch September 22, 2025 05:34
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.

3 participants