Skip to content

Conversation

@alvarosimon
Copy link
Member

Required to add q35 hw machine types

#1776 must be merged first

Resolves: #1821

@jrha jrha added this to the 25.next milestone Jun 26, 2025
@wpoely86
Copy link
Member

Can you rebase?

@alvarosimon
Copy link
Member Author

Can you rebase?

@wpoely86 done!

"cores", 1,
);

"machine" = "pc-q35-rhel9.4.0";
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't the output of a tests also be changed?

Copy link
Member Author

Choose a reason for hiding this comment

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

@wpoely86 indeed, I have included the missing regex

Copy link
Member

Choose a reason for hiding this comment

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

But how could the tests pass before this change?

The remark for the change in test/resources/vm.pan ?

Copy link
Member

Choose a reason for hiding this comment

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

the regex turned out to be not very strict. Fixed also.

ah ok why it was working before (actually I also forgot to include the check) is because the test itself the regex is not quite strict as you can see it was:

^MEMORY\s?=\s*"\d+"\s*$
^OS\s?=\s?\[$
^\s*BOOT\s?=\s*""\s*$
^RAW\s?=\s?\[$

so this also work if I include something after OS = [ so the regex was working indeed before, now I have included the regex explicitly so if you modify MACHINE it will fail
so the previous check only was looking for BOOT after OS and indeed it was right.. even if I include MACHINE between... now its more explicit

@wpoely86 wpoely86 merged commit dcdc640 into quattor:main Jul 16, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

ncm-opennebula: add OS/MACHINE type option for VM templates

3 participants