Fix the failture of ubipop for rhel7 #240
Conversation
1.add UBIPOP_SKIP_PUBLISH and PUB_CONFIG_FILE
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #240 +/- ##
=======================================
Coverage 98.77% 98.77%
=======================================
Files 7 7
Lines 732 732
=======================================
Hits 723 723
Misses 9 9 ☔ View full report in Codecov by Sentry. |
1.remove the empty string when query module in fedora 40 slave node
LinglingXiang
force-pushed
the
master
branch
from
d783c17 to
4335d49
Compare
| @@ -427,14 +427,18 @@ def test_run_ubi_pop_for_rhel7(pulp_client): | |||
| ), "Can't find the modulemd_default :{}".format(modulemd_defaults) | |||
|
|
|||
| # verify the modulemd exist and modulemd default in the cdn server | |||
| modulemds = query_repo_modules(None, "ubi", rpm_repo_url, full_data=True) | |||
| modulemds = query_repo_modules(None, "ubi", rpm_repo_url) | |||
There was a problem hiding this comment.
you do another unnecessary call for the second time a few lines later, can you please refactor this so it does only one call and then filters received data in query_repo_modules ?
| @@ -427,14 +427,18 @@ def test_run_ubi_pop_for_rhel7(pulp_client): | |||
| ), "Can't find the modulemd_default :{}".format(modulemd_defaults) | |||
|
|
|||
| # verify the modulemd exist and modulemd default in the cdn server | |||
| modulemds = query_repo_modules(None, "ubi", rpm_repo_url, full_data=True) | |||
| modulemds = query_repo_modules(None, "ubi", rpm_repo_url) | |||
| while "" in modulemds: | |||
There was a problem hiding this comment.
can you move this to query_repo_modules function? This filtering shouldn't be part of test. You can likely need this operation for other tests in future, so it's better to be done once in the function.
There was a problem hiding this comment.
the same as below comments, i will close the merge request.
and submit a patch for changing the slave
| mod_name, mod_profile = separate_modules(modulemds)[0] | ||
| assert mod_name == "httpd", "Expected modulemd: httpd, found modulemd: {}".format( | ||
| mod_name | ||
| ) | ||
| assert ( | ||
| "common [d]" in mod_profile | ||
| "common" in mod_profile |
There was a problem hiding this comment.
Did really the output changed for default modules? Or do we have rather problem in testing data or ubi-population-tool?
There was a problem hiding this comment.
hi Robert, the cause is the same as previous one query_repo_modules. After some investigation, the method works well in fedora38, in fedora 40, it will return in wrong format
Name Stream Profiles Summary
httpd 2.4 [d] common [ Apache HTTP Server
d], defa
ult, dev
el
if i update the yum update util-linux in fedora 40, the method can return mormally.
In summary, nothing wrong in this method, but something problem in os.
so i will change the fedora 40 slave script instead of changing the method
After the slave update from fedora 38 to fedora 40, the module query list return empty string, so remove the empty string and make the test case is pass.