Use correct version of ubi config file for population #140
Conversation
JayZ12138
requested review from
midnightercz,
negillett,
alexandrevicenzi,
rajulkumar and
rohanpm
|
Tests will be added/modified later. |
ubipop/__init__.py
Outdated
| # then it's not a mainline repo, use platform_full_version instead. | ||
| version = repo_set.out_repos.rpm.ubi_config_version \ | ||
| or repo_set.out_repos.rpm.platform_full_version | ||
| right_config = self.ubiconfig_map.get(version, {}).get(config.filename) |
There was a problem hiding this comment.
This doesn't seem to fulfill following acceptance criteria:
if ubi config is not available for given version, fallback to default version ("7" for ubi7, "8" for ubi8 )
In ubi config repo there will always be 'default' branches ubi7 and ubi8 where you need to fallback if config for required version isn't available. And if I read it correctly, it can assign None to right_config var which will lead ubipop to crash. This can happen for both DOT and mainline repos.
Or there can be some "best effort" mechanism which can select the latest available config < required version, if required config is not available. But this is not needed now I guess.
There was a problem hiding this comment.
Thanks for this. I wasn't sure what's 'default version'.
I'm still confused about why 'version' could be None? could you elaborate on it?
There was a problem hiding this comment.
I mean, isn't platform_full_version always available?
There was a problem hiding this comment.
ah, I misread.
yeah, right_config could be None and it leads to the push crashing. I saw that in the first place and I didn't do any exception for it, because I think it should fail in this case, means there's a major error in config repo, we should fail this push.
Do you think we should ignore and continue push?
There was a problem hiding this comment.
Good question.
Well these default branches (ubi7, ubi8) should be always available.
If they are not available, I'd like to see at least an error message logged so ubipop can populate as much as it can.
JayZ12138
force-pushed
the
7878
branch
4 times, most recently
from
5d524ec
to
ce3922a
Compare
|
I'm not sure why CI passed... |
|
run tests |
| @@ -26,6 +26,10 @@ class RepoMissing(Exception): | |||
| pass | |||
|
|
|||
|
|
|||
| class ConfigMissing(Exception): | |||
There was a problem hiding this comment.
MissingConfig sounds better
There was a problem hiding this comment.
I think this is fine, conforms to existing scheme
| # config file could also be missing for specific version, then the | ||
| # default config file will be used. | ||
| version = ubi_config_version or platform_full_version | ||
| right_config = self.ubiconfig_map\ |
There was a problem hiding this comment.
Break only on or, this is hard to read, but not a big deal.
|
@JayZ12138 |
Yes. |
This resloves release-engineering#138 A new attr is added to Repo class and it will be populated while searching repos. After all config files are loaded, it now creates a config map, which helps find the right config file for the repo to populate.
config file for specific version might not available, it should fall back to load the config file from default version.
|
run tests |
|
run tests |
|
Run tests |
|
run tests |
| @@ -26,6 +26,10 @@ class RepoMissing(Exception): | |||
| pass | |||
|
|
|||
|
|
|||
| class ConfigMissing(Exception): | |||
There was a problem hiding this comment.
I think this is fine, conforms to existing scheme
This resloves #138
A new attr is added to Repo class and it will be populated while
searching repos.
After all config files are loaded, it now creates a config map, which
helps find the right config file for the repo to populate.