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

LTP: Adapt record_info() output to Micro #19983

Merged
merged 2 commits into from
Aug 22, 2024

Conversation

pevik
Copy link
Contributor

@pevik pevik commented Aug 16, 2024

Verification run:

kernel-default-6.4.0-17.1.x86_64
kernel-rt-6.4.0-slfo.1.2.7.x86_64
kernel-default-extra-6.4.0-17.1.x86_64
nfs-kernel-server-2.6.3-36.15.x86_64

Copy link

Great PR! Please pay attention to the following items before merging:

Files matching lib/**.pm:

  • Consider adding or extending unit tests in t/

This is an automatically generated QA checklist based on modified files.

@pevik pevik requested a review from czerw August 16, 2024 07:27
@pevik
Copy link
Contributor Author

pevik commented Aug 16, 2024

This error is not caused by changes I did:

tests/migration/prepare_maintenance_repos.pm module is not used in any schedule

@pevik pevik force-pushed the fix/add_custom_grub_entries branch from 28c5729 to 9021f8e Compare August 16, 2024 07:39
@czerw
Copy link
Contributor

czerw commented Aug 16, 2024

It could use enter_trup_shell from #19795.

@pevik
Copy link
Contributor Author

pevik commented Aug 16, 2024

But that would require to have exit_trup_shell() merged, right?

@czerw
Copy link
Contributor

czerw commented Aug 16, 2024

But that would require to have exit_trup_shell() merged, right?

Yes.

@pevik pevik force-pushed the fix/add_custom_grub_entries branch 3 times, most recently from db5e21a to c14f2b4 Compare August 21, 2024 09:16
lib/LTP/utils.pm Outdated Show resolved Hide resolved
Copy link
Contributor

@mdoucha mdoucha left a comment

Choose a reason for hiding this comment

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

use transactional; appears to be missing at the top of the file which results in compilation failure due to undefined reference to enter/exit_trup_shell().

Copy link
Contributor

@mdoucha mdoucha left a comment

Choose a reason for hiding this comment

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

Please create new verification runs, otherwise LGTM.

Missing purge-kernels can be misleading (it's not e.g. on Micro).
Let's check again for the binary before running it (as it was before
7af63e2).

Signed-off-by: Petr Vorel <[email protected]>
By using enter_trup_shell and exit_trup_shell.

Signed-off-by: Petr Vorel <[email protected]>
@pevik pevik force-pushed the fix/add_custom_grub_entries branch from 404a9f8 to 80bee23 Compare August 22, 2024 14:07
@pevik
Copy link
Contributor Author

pevik commented Aug 22, 2024

Restarted jobs, some of them already passed.

Copy link
Contributor

@czerw czerw left a comment

Choose a reason for hiding this comment

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

Thanks a lot!

@czerw czerw merged commit 29c0b44 into os-autoinst:master Aug 22, 2024
10 checks passed
pevik added a commit to pevik/os-autoinst-distri-opensuse that referenced this pull request Aug 23, 2024
rpm -qi /tmp/kernel-pkg.txt 2>&1 needs to be in trup_shell for valid rpm
packages, but also cannot be in trup shell, because then file is created
somewhere else. Therefore instead using trup shell use
'transactional-update -c run' (as was in the original proposal os-autoinst#19983).

This fixes error in boot_ltp
cat: /tmp/ver_linux_before.txt:

Fixes: 80bee23 ("LTP: Adapt record_info() output to Micro")
Fixes: https://progress.opensuse.org/issues/165731
Reported-by: Petr Cervinka <[email protected]>
Signed-off-by: Petr Vorel <[email protected]>
pevik added a commit to pevik/os-autoinst-distri-opensuse that referenced this pull request Aug 23, 2024
rpm -qi /tmp/kernel-pkg.txt 2>&1 needs to be in trup_shell for valid rpm
packages, but also cannot be in trup shell, because then file is created
somewhere else. Therefore instead using trup shell use
'transactional-update -c run' (as was in the original proposal os-autoinst#19983).

This fixes error in boot_ltp
cat: /tmp/ver_linux_before.txt:

Also run ver_linux via 'transactional-update -c run' to get updated
packages version.

Fixes: 80bee23 ("LTP: Adapt record_info() output to Micro")
Fixes: https://progress.opensuse.org/issues/165731
Reported-by: Petr Cervinka <[email protected]>
Signed-off-by: Petr Vorel <[email protected]>
pevik added a commit to pevik/os-autoinst-distri-opensuse that referenced this pull request Aug 23, 2024
First, trup shell should be called after the system rebooted into the
latest snapshot, it will print wrong versions.

Also using 'rpm -qi /tmp/kernel-pkg.txt 2>&1' inside trup shell did
failed (on Micro):

    This fixes error in boot_ltp
    cat: /tmp/ver_linux_before.txt:

Therefore instead using trup shell use 'transactional-update -c run' (as
was in the original proposal os-autoinst#19983).

Also run ver_linux via 'transactional-update -c run' to get updated
packages version.

Fixes: 80bee23 ("LTP: Adapt record_info() output to Micro")
Fixes: https://progress.opensuse.org/issues/165731
Reported-by: Petr Cervinka <[email protected]>
Signed-off-by: Petr Vorel <[email protected]>
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