Add os-release ID_LIKE to features #598
Conversation
|
PipelineRetry |
|
PipelineRetry |
| @@ -623,8 +623,12 @@ def test_010_os_metadata(self): | |||
| self.assertIsNotNone(tpl.features.get('os-eol')) | |||
| elif self.template.startswith('whonix-'): | |||
| self.assertEqual(tpl.features.get('os-distribution'), 'whonix') | |||
| self.assertEqual(tpl.features.get('os-distribution-like'), 'debian') | |||
There was a problem hiding this comment.
This test failed for (both) Whonix templates, the bot will post details when the run completes. I do see in the log it sent some info to dom0 after installing updates:
Jun 10 08:27:55 dom0 qrexec-policy-daemon[19866]: qrexec: qubes.FeaturesRequest+: whonix-workstation-17 -> @adminvm: allowed to dom0
There was a problem hiding this comment.
This depends on the other PR QubesOS/qubes-core-agent-linux#504
elif [ -f /usr/share/whonix/marker ]; then
distro="whonix"
distro_like="debian"Because Whonix does not set /etc/os-release to the norm of using ID_LIKE=, the value will just be reported correctly after the other PR is merged. Is my assumption correct?
There was a problem hiding this comment.
I also assume that Whonix reposted an empty value for os-distribution-like as Whonix does not set ID_LIKE=. It will just work after the other PR is merged unless tests could be made upon the other PR branch also instead of the main branch.
There was a problem hiding this comment.
The test did run with the other PR included too...
There was a problem hiding this comment.
Ok, I do not understand the issue yet, I read the OpenQA output. Last commit only fixes the version gathering for Whonix and Kicksecure which where inverted.
There was a problem hiding this comment.
Ok, the issue was with the version gathering, I inverted Whonix and Kicksecure information and with set -e, it was exiting on the first error:
+ [ -f /usr/share/kicksecure/marker ]
+ [ -f /usr/share/whonix/marker ]
+ distro=whonix
+ distro_like=debian
+ cat /etc/kicksecure_version
cat: /etc/kicksecure_version: No such file or directory
+ version=
zsh: exit 1 sudo sh -x ./10-qubes-core-agent-features.shLast commit QubesOS/qubes-core-agent-linux@c33b577 fixes this issue. Comparison.
|
PipelineRetry |
ben-grande
force-pushed
the
report-id-like
branch
from
20471bf to
0f3bef9
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #598 +/- ##
=======================================
Coverage 68.39% 68.40%
=======================================
Files 56 56
Lines 11221 11223 +2
=======================================
+ Hits 7675 7677 +2
Misses 3546 3546
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
OpenQA test summaryComplete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2024061011-4.3&flavor=pull-requests Test run included the following:
New failures, excluding unstableCompared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2024052808-4.3&flavor=update
Failed tests22 failures
Fixed failuresCompared to: https://openqa.qubes-os.org/tests/101100#dependencies 37 fixed
Unstable tests |
For: QubesOS/qubes-core-agent-linux#504