msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29428 )

Change subject: scripts/obs/*.py: add option to ignore required programs check ......................................................................

scripts/obs/*.py: add option to ignore required programs check

Not all the required programs are actually required to build subset of packages. Add option to ignore the default check.

Change-Id: I8b5eaedab87b586fb1ca4c22746be4dfbb3c2176 --- M scripts/obs/build_srcpkg.py M scripts/obs/lib/__init__.py M scripts/obs/update_obs_project.py 3 files changed, 9 insertions(+), 2 deletions(-)

Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified

diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py index ea7ab34..066d370 100755 --- a/scripts/obs/build_srcpkg.py +++ b/scripts/obs/build_srcpkg.py @@ -31,7 +31,9 @@ if args.docker: lib.docker.run_in_docker_and_exit(__file__, args)

- lib.check_required_programs() + if not args.ignore_req: + lib.check_required_programs() + if args.package: lib.check_package(args.package) lib.remove_temp() diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 1ed5ef5..f94c0a8 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -33,6 +33,8 @@ action="store_false", dest="git_fetch") parser.add_argument("-m", "--meta", action="store_true", help="build a meta package (e.g. osmocom-nightly)") + parser.add_argument("-i", "--ignore-req", action="store_true", + help="skip required programs check") parser.add_argument("-c", "--conflict-version", nargs="?", help="Of the generated source packages, all Osmocom" " packages (not e.g. open5gs, see lib/config.py" diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 61691f6..aa33984 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -202,7 +202,10 @@ lib.osc.check_proj(proj) lib.osc.check_oscrc() lib.osc.set_apiurl(args.apiurl) - lib.check_required_programs() + + if not args.ignore_req: + lib.check_required_programs() + lib.remove_temp()

pkgs_remote = lib.osc.get_remote_pkgs(proj)