BCI: LTSS containers testing on LTSS hosts only #21099
Conversation
m-dati
requested review from
pdostal,
grisu48,
mloviska,
ricardobranco777 and
rbmarliere
as code owners
m-dati
force-pushed
the
bci_host_ltss
branch
2 times, most recently
from
5121dae to
d85f914
Compare
tests/containers/bci_prepare.pm
Outdated
| die "OUT SCOPE: LTSS containers $cont_vers on $host_dist $host_vers host test excluded." | ||
| unless ($host_dist =~ /^sle/ && $host_vers =~ /^1[25]/ && $host_vers eq substr($cont_vers, 0, 2)); | ||
| # check LTSS activation | ||
| my $status = q(SUSEConnect -s | jq -Mr '.[] | select(.identifier == "SLES-LTSS") | .subscription_status'); |
There was a problem hiding this comment.
I think the whole PR can re reduced to a SLES version check and this command.
@m-dati would you care to simplify the PR please?
There was a problem hiding this comment.
Please, could you elaborate about 'simplify', being this logic at different levels of checks?
This is a check to verfiy if rules are satisfied otherwise stop run in the negative case. Each previous 'return' or 'die' is propaedeutic check of a part of the rules (also explained in the comments), before next level, till final return. And it seemed already miminal.
There was a problem hiding this comment.
if (get_var('CONTAINER_IMAGE_TO_TEST') =~ "ltss") {
validate_script_output('SUSEConnect -s | jq -Mr ".[] | select(.identifier == \"SLES-LTSS\") | .subscription_status"', qr/ACTIVE/, fail_message => "Host requires LTSS subscription for LTSS container");
}
There was a problem hiding this comment.
You could even make a one-liner out of this.
There was a problem hiding this comment.
But, lines n.88 and n.93 on versions also are needed to be verified, other than the 'ltss' part: in your proposal those tests are missing.
This routine envelopes all the checks and seemed cleaner as solution.
There was a problem hiding this comment.
They are not needed because on those SLES versions, the LTSS extension is not available anyways.
At the end, all you need to check is if there is a LTSS Subscription active, and your code does that in a rather elegant way already.
There was a problem hiding this comment.
Plus: Removing those version checks means we also do not need to edit the code in the future, when 15-SP6 or 15-SP7 become LTSS as well. Your check via SUSEConnect still works and does not require future changes.
An
LTSS containershall run only on sleLTSS hostwith egistration activated, otherwise stop.Related ticket: https://progress.opensuse.org/issues/175938
Verification run:
FAIL: as expected, non-sle host and LTSS container
PASS: LTSS host and LTSS container