PR#1008: Allow module components to use a git ref outside of the master branch - fm-orchestrator

fm-orchestrator

#1008 Allow module components to use a git ref outside of the master branch

Merged 5 years ago by mprahl. Opened 5 years ago by mprahl.

component-module-branch-ref into master

Allow module components to use a git ref outside of the master branch

mprahl • 5 years ago

9d40718

module_build_service/utils/submit.py

file modified

+2 -1

		`@@ -477,7 +477,8 @@`
		`else:`
		`scm = module_build_service.scm.SCM(url, branch, conf.scmurls, allow_local_url)`
		`scm.checkout(td)`
		`- scm.verify()`
		`+ if not whitelist_url:`
		`+ scm.verify()`
		`cofn = scm.get_module_yaml()`
		`mmd = load_mmd(cofn, is_file=True)`
		`finally:`

mprahl commented 5 years ago

In record_component_builds, a call is made to _fetch_mmd which is supposed to fetch the modulemd of the module component. As part of this call, scm.verify() runs as an attempt to verify the git ref you requested is from the branch you're building from. If you provide a git ref outside the master branch, this fails because the branch is not known, so therefore, scm.branch defaults to master.

scm.verify should only apply to the call to _fetch_mmd in submit_module_build_from_scm, where the branch of the module is known. When fetching the modulemd of the module component, we only know the supplied ref, so this PR skips that check and allows us to use refs not in the master branch.

mprahl commented 5 years ago

@jkaluza could you please review?