Filter embargoed also by Flavor #164
Conversation
| @@ -8,7 +8,7 @@ def test_aggregate_constructor(): | |||
| needed by the constructor? | |||
| """ | |||
| config = {} | |||
| config["FLAVOR"] = None | |||
| config["FLAVOR"] = "None" | |||
There was a problem hiding this comment.
I guess FLAVOR is actually a key name from metadata so in reality it cannot be None so the change to string make sense.
| return any(k.startswith("PUBLIC") for k in self.settings.keys()) | ||
| def filter_embargoed(self, flavor: str) -> bool: | ||
| return any(k.startswith("PUBLIC") for k in self.settings) or any( | ||
| flavor.startswith(s) for s in ("Azure", "EC2", "GCE") |
There was a problem hiding this comment.
Is using of startswith too restrictive?
It will works as expected but I'm not sure there's any "official rule" that say that name of the cloud provider has to be used at the beginning of the FLAVOR name.
More deeply in the PC test lib there's a more coded convention based on PUBLIC_CLOUD_PROVIDER and not on FLAVOR
There's a PC lib setting named PUBLIC_CLOUD_PROVIDER that has a coded naming convention: https://github.com/os-autoinst/os-autoinst-distri-opensuse/blob/2e0b43a6f0cea5d2e8856e2a35d8bb23bb625325/lib/publiccloud/basetest.pm#L33
Then, at least for the QE-SAP jobs the connection between FLAVOR and PUBLIC_CLOUD_PROVIDER happens at JobGroup level (have a look for the setting name in JobGroup file openQA/yaml_job_groups/maintenance/maintenance_sle15_sp5_sap.yml in repo openqa_ha_sap
There was a problem hiding this comment.
the problem which @mimi1vx was trying to address here that currently https://gitlab.suse.de/qa-maintenance/metadata does not have PUBLIC_CLOUD_PROVIDER for SAP related products . And if you will add it there than you won't need second part at all . Because any(k.startswith("PUBLIC") for k in self.settings) would already return true for PUBLIC_CLOUD_PROVIDER variable no matter what value it has
There was a problem hiding this comment.
Yes but those files not only have Cloud tests in them, adding a dummy setting on the top like
product: SAP-15-SP5
settings:
DISTRI: sle
VERSION: '15-SP5'
PUBLIC_DONALDUCK: 'Rockerduck'
will result influencing also the non cloud tests managed by that file.
Could you confirm it?
| def filter_embargoed(self) -> bool: | ||
| return any(k.startswith("PUBLIC") for k in self.settings.keys()) | ||
| def filter_embargoed(self, flavor: str) -> bool: | ||
| return any(k.startswith("PUBLIC") for k in self.settings) or any( |
There was a problem hiding this comment.
I think here it is safe to have startswith but PUBLIC can be extended to PUBLIC_CLOUD
|
I'd like to propose a possible different approach to drastically simplify logic in |
https://progress.opensuse.org/issues/153334