From cd71ccefe9adf411ac6909015b702783795d9a5d Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Thu, 25 Mar 2021 08:48:30 -0500 Subject: [PATCH 01/10] Fix remaining flake8 complaints, including line-too-long and an unused import Make flake8 failure fatal in tox.ini --- README.md | 4 ++++ lib/distrobaker.py | 23 ++++++++++++++++------- pyproject.toml | 2 ++ tests/test_config.py | 1 - tox.ini | 3 +-- 5 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 pyproject.toml diff --git a/README.md b/README.md index fa657bb..b83c617 100644 --- a/README.md +++ b/README.md @@ -386,6 +386,10 @@ cache: ## Development +### Code style + +Please format code using `black -l 79`. + ### Unit-testing Install packages required to test the python scripts: diff --git a/lib/distrobaker.py b/lib/distrobaker.py index 61a124b..cacdf63 100644 --- a/lib/distrobaker.py +++ b/lib/distrobaker.py @@ -380,7 +380,10 @@ def load_config(crepo): } nc[k][p]["destination"] = n["defaults"][k][ "destination" - ] % {"component": cname, "stream": sname} + ] % { + "component": cname, + "stream": sname, + } nc[k][p]["cache"] = { "source": n["defaults"]["cache"]["source"] % {"component": cname, "stream": sname}, @@ -897,7 +900,8 @@ def sync_cache(comp, sources, ns="rpms"): "{}/{}".format(ns, dcname), s[0], s[1] ): logger.debug( - "File %s for %s/%s (%s/%s) not available in the destination cache, downloading.", + "File %s for %s/%s (%s/%s) not available in the " + "destination cache, downloading.", s[0], ns, comp, @@ -927,7 +931,8 @@ def sync_cache(comp, sources, ns="rpms"): s[1], ) logger.debug( - "File %s for %s/%s (%s/%s) )successfully uploaded to the destination cache.", + "File %s for %s/%s (%s/%s) )successfully uploaded " + "to the destination cache.", s[0], ns, comp, @@ -968,7 +973,8 @@ def sync_cache(comp, sources, ns="rpms"): break else: logger.error( - "Exhausted lookaside cache synchronization attempts for %s/%s while working on %s, skipping.", + "Exhausted lookaside cache synchronization attempts for %s/%s " + "while working on %s, skipping.", ns, comp, s[0], @@ -1122,12 +1128,14 @@ def process_message(msg): ) else: logger.debug( - "RPM component %s not configured for sync and the strict mode is enabled, ignoring.", + "RPM component %s not configured for sync and the strict " + "mode is enabled, ignoring.", comp, ) elif tag == c["main"]["trigger"]["modules"]: logger.error( - "The message matches our module configuration but module building not implemented, ignoring." + "The message matches our module configuration but module " + "building not implemented, ignoring." ) else: logger.debug("Message tag not configured as a trigger, ignoring.") @@ -1173,7 +1181,8 @@ def process_components(compset): logger.info("Processing %s.", rec) if m["namespace"] == "modules": logger.warning( - "The modules/%s component is a module; modules currently not implemented, skipping.", + "The modules/%s component is a module; modules currently not " + "implemented, skipping.", m["component"], ) continue diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..a8f43fe --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,2 @@ +[tool.black] +line-length = 79 diff --git a/tests/test_config.py b/tests/test_config.py index 7dd95b2..aee425f 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -3,7 +3,6 @@ import distrobaker import helpers import os -import pytest import sys import tempfile diff --git a/tox.ini b/tox.ini index cb402d1..06ff5b6 100644 --- a/tox.ini +++ b/tox.ini @@ -19,5 +19,4 @@ setenv = basepython = python3 skip_install = true deps = flake8 -# FIXME: exit status currently ignored until code is reformatted to PEP 8 guidelines -commands = -flake8 +commands = flake8 From 48a8aabf09058944fab2ee9ec410ab1dd09d5243 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Wed, 28 Apr 2021 11:11:06 -0500 Subject: [PATCH 02/10] Add support for syncing/building modules Signed-off-by: Merlin Mathesius --- README.md | 78 +- distrobaker | 3 - lib/distrobaker.py | 945 +++++++++++++++--- requirements.txt | 4 +- test-requirements.txt | 1 + .../distrobaker-dest-mbs-not-mapping.yaml | 74 ++ .../distrobaker-extraneous-source-mbs.yaml | 84 ++ .../config/distrobaker-missing-dest-mbs.yaml | 73 ++ .../config/distrobaker-no-source-profile.yaml | 13 +- tests/data/config/distrobaker-no-trigger.yaml | 13 +- .../distrobaker-process_components.yaml | 75 ++ tests/data/config/distrobaker.yaml | 21 +- tests/helpers.py | 5 + tests/test_config.py | 92 +- tests/test_process_comps.py | 316 ++++++ tests/test_process_comps_unconfigured.py | 29 + 16 files changed, 1662 insertions(+), 164 deletions(-) create mode 100644 tests/data/config/distrobaker-dest-mbs-not-mapping.yaml create mode 100644 tests/data/config/distrobaker-extraneous-source-mbs.yaml create mode 100644 tests/data/config/distrobaker-missing-dest-mbs.yaml create mode 100644 tests/data/config/distrobaker-process_components.yaml create mode 100644 tests/test_process_comps.py create mode 100644 tests/test_process_comps_unconfigured.py diff --git a/README.md b/README.md index b83c617..2ceba3a 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,6 @@ configuration: cgi: https://src.fedoraproject.org/repo/pkgs/upload.cgi path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" profile: koji - mbs: https://mbs.fedoraproject.org destination: scm: ssh://pkgs.example.com/ cache: @@ -106,7 +105,16 @@ configuration: cgi: http://pkgs.example.com/lookaside/upload.cgi path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" profile: brew - mbs: https://mbs.example.com + mbs: + api_url: https://mbs.example.com/module-build-service/1/ + auth_method: oidc + oidc_id_provider: https://id.example.com/openidc/ + oidc_client_id: mbs-authorizer + oidc_client_secret: notsecret + oidc_scopes: + - openid + - https://id.example.com/scope/groups + - https://mbs.example.com/oidc/submit-build trigger: rpms: rawhide modules: rawhide-modular @@ -114,6 +122,7 @@ configuration: prefix: git://pkgs.example.com/ target: fluff-42.0.0-alpha-candidate scratch: false + platform: platform:fl42 git: author: DistroBaker email: noreply@example.com @@ -140,6 +149,9 @@ configuration: modules: source: "%(component)s.git#%(stream)s" destination: "%(component)s.git#%(stream)s-fluff-42.0.0-alpha" + rpms: + source: "%(component)s.git" + destination: "%(component)s.git#stream-%(name)s-%(stream)s" cache: source: "%(component)s" destination: "%(component)s" @@ -156,6 +168,10 @@ components: modules: testmodule:master: destination: testmodule#stream-master-fluff-42.0.0-alpha-experimental + rpms: + componentrpm: + source: componentsource.git#sourcebranch + destination: coomponentrpm.git#fluff-42.0.0-alpha-experimental ``` ### Configuration options @@ -184,8 +200,6 @@ passed to pyrpkg defining the file path used by this particular cache. configuration must be available on the host, along with the necessary certificates. -`mbs` is a stub link to the MBS instance. This is currently unused. - Example: ```yaml @@ -196,7 +210,6 @@ source: cgi: https://src.fedoraproject.org/repo/pkgs/upload.cgi path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" profile: koji - mbs: https://mbs.fedoraproject.org ``` ##### `destination` @@ -205,7 +218,38 @@ The `destination` block configures the downstream destination source control and cache. DistroBaker needs write access to both to effectively sync components. -The structure is the same as that of the `source` block. +The structure is the same as that of the `source` block plus the addition of a +mandatory `mbs` block. + +The `mbs` block configures the MBS instance used for building modules. It must +always contain `api_url` and `auth_method` properties. `auth_method` must be +`kerberos` or `oidc`. When `auth_method` is `oidc`, additional +`oidc_id_provider`, `oidc_client_id`, `oidc_client_secret`, and `oidc_scopes` +properties must be provided. The values to use for the `mbs` sub-properties +can be taken directly from the `[.mbs]` section of the appropriate +`/etc/rpkg/.conf` (eg., `/etc/rpkg/centpkg.conf`) file. + +Example: + +```yaml +destination: + scm: ssh://pkgs.example.com/ + cache: + url: http://pkgs.example.com/repo + cgi: http://pkgs.example.com/lookaside/upload.cgi + path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" + profile: brew + mbs: + api_url: https://mbs.example.com/module-build-service/1/ + auth_method: oidc + oidc_id_provider: https://id.example.com/openidc/ + oidc_client_id: mbs-authorizer + oidc_client_secret: notsecret + oidc_scopes: + - openid + - https://id.example.com/scope/groups + - https://mbs.example.com/oidc/submit-build +``` ##### `trigger` @@ -235,6 +279,8 @@ system can access. Could be read-only. The `target` property defines the destination build system target. Targets are buildroot and destination tag tuples. +The `platform` property defines the destination module build system target platform in `:` format. + Example: ```yaml @@ -242,6 +288,7 @@ build: prefix: git://pkgs.example.com/ target: fluff-42.0.0-alpha-candidate scratch: false + platform: platform:fl42 ``` ##### `git` @@ -311,8 +358,14 @@ or known and defined components that do not define these fields. The block is split into three identical sections, `cache` and the namespaces, `rpms` and `modules`. Each holds two properties, `source` and `destination`. -The values are old-style Python format strings formatted with `component` for -the component name, and `stream` for the module stream name. +The `modules` namespace section can also contain an `rpms` namespace +sub-section with `source` and `destination` properties that will be applied to +RPM sub-components of modules. + +The values are old-style Python format strings formatted with `%(component)s` for +the component name, and `%(stream)s` for the module stream name. Values in the +`rpms` sub-section of the `modules` namespace can also use `%(name)s` for the +module name, and `%(ref)s` for the modulemd-provided `ref`. Example: @@ -327,6 +380,9 @@ defaults: modules: source: "%(component)s.git#%(stream)s" destination: "%(component)s.git#%(stream)s-fluff-42.0.0-alpha" + rpms: + source: "%(component)s.git" + destination: "%(component)s.git#stream-%(name)s-%(stream)s" ``` #### `components` @@ -339,6 +395,10 @@ unless overriden. Components may define their `source`, `destination` and `cache`. Omitted fields are populated from the defaults. See `configuration.defaults`. +Components in the `modules` namespace may also contain an `rpms` sub-section +that can define overriding `source`, `destination` and `cache` properties for +specific RPM sub-components of that module. + If components need to be defined explicitly (for instance for `strict: true`) without overriding any defaults, both an empty dictionary and null are valid. For example: @@ -397,7 +457,9 @@ Install packages required to test the python scripts: ``` $ sudo dnf install -y \ gcc \ + cairo-gobject-devel \ git \ + gobject-introspection-devel \ krb5-devel \ libcurl-devel \ openssl-devel \ diff --git a/distrobaker b/distrobaker index d84c6ac..34304e9 100755 --- a/distrobaker +++ b/distrobaker @@ -193,9 +193,6 @@ def main(): ) if args.oneshot: logger.info("Starting DistroBaker in the oneshot mode.") - logger.warning( - "Modules currently not implemented and will be ignored." - ) chew( set(regex.split(r"\s+", args.select)) if args.select else set(), logger, diff --git a/lib/distrobaker.py b/lib/distrobaker.py index cacdf63..a37d6f0 100644 --- a/lib/distrobaker.py +++ b/lib/distrobaker.py @@ -6,11 +6,18 @@ import datetime import git +import json import koji import pyrpkg import regex +import requests import yaml +import gi + +gi.require_version("Modulemd", "2.0") +from gi.repository import Modulemd # noqa: E402 + # Global logger logger = logging.getLogger(__name__) @@ -253,10 +260,87 @@ def load_config(crepo): logger.error("Configuration error: %s.profile missing.", k) return None if "mbs" in cnf[k]: - n[k]["mbs"] = str(cnf[k]["mbs"]) + # MBS properties are only relevant for the destination + if k == "destination": + if not isinstance(cnf[k]["mbs"], dict): + logger.error( + "Configuration error: %s.mbs must be a mapping.", + k, + ) + return None + if "auth_method" not in cnf[k]["mbs"]: + logger.error( + "Configuration error: %s.mbs.%s is missing.", + k, + "auth_method", + ) + return None + mbs_auth_method = str(cnf[k]["mbs"]["auth_method"]) + mbs_required_configs = ["auth_method", "api_url"] + if mbs_auth_method == "oidc": + # Try to import this now so the user gets immediate + # feedback if it isn't installed + try: + import openidc_client # noqa: F401 + except ImportError: + logger.exception( + "python-openidc-client needs to be " + "installed for %s.mbs.%s %s", + k, + "auth_method", + mbs_auth_method, + ) + return None + mbs_required_configs += [ + "oidc_id_provider", + "oidc_client_id", + "oidc_client_secret", + "oidc_scopes", + ] + elif mbs_auth_method == "kerberos": + # Try to import this now so the user gets immediate + # feedback if it isn't installed + try: + import requests_kerberos # noqa: F401 + except ImportError: + logger.exception( + "python-requests-kerberos needs to be " + "installed for %s.mbs.%s %s", + k, + "auth_method", + mbs_auth_method, + ) + return None + else: + logger.error( + "Configuration error: %s.mbs.%s %s is unsupported.", + k, + "auth_method", + mbs_auth_method, + ) + return None + n[k]["mbs"] = dict() + for r in mbs_required_configs: + if r not in cnf[k]["mbs"]: + logger.error( + "Configuration error: %s.mbs.%s is required when %s is %s.", + k, + r, + "auth_method", + mbs_auth_method, + ) + return None + n[k]["mbs"][r] = cnf[k]["mbs"][r] + else: + logger.warning( + "Configuration warning: %s.mbs is extraneous, ignoring.", + k, + ) else: - logger.error("Configuration error: %s.mbs missing.", k) - return None + # MBS properties required for destination + if k == "destination": + logger.error("Configuration error: %s.mbs missing.", k) + return None else: logger.error("Configuration error: %s missing.", k) return None @@ -272,7 +356,7 @@ def load_config(crepo): return None if "build" in cnf: n["build"] = dict() - for k in ("prefix", "target"): + for k in ("prefix", "target", "platform"): if k in cnf["build"]: n["build"][k] = str(cnf["build"][k]) else: @@ -285,6 +369,13 @@ def load_config(crepo): "Configuration warning: build.scratch not defined, assuming false." ) n["build"]["scratch"] = False + if ":" not in n["build"]["platform"]: + logger.error( + "Configuration error: build.%s.%s must be in name:stream format.", + k, + "platform", + ) + return None else: logger.error("Configuration error: build missing.") return None @@ -350,6 +441,29 @@ def load_config(crepo): "Configuration error: defaults.%s missing.", dk ) return None + # parse defaults for module sub-components + for dk in ("rpms",): + n["defaults"]["modules"][dk] = dict() + for dkk in ("source", "destination"): + if ( + dk in cnf["defaults"]["modules"] + and dkk in cnf["defaults"]["modules"][dk] + ): + n["defaults"]["modules"][dk][dkk] = cnf["defaults"][ + "modules" + ][dk][dkk] + else: + logger.warning( + "Configuration warning: defaults.modules.%s.%s " + "not defined, using value from defaults.%s.%s", + dk, + dkk, + dk, + dkk, + ) + n["defaults"]["modules"][dk][dkk] = str( + n["defaults"][dk][dkk] + ) else: logger.error("Configuration error: defaults missing.") return None @@ -401,6 +515,26 @@ def load_config(crepo): nc[k][p]["cache"][ck] = str( cnf[k][p]["cache"][ck] ) + if k == "modules": + # parse overrides for module sub-components + for cn in ("rpms",): + nc[k][p][cn] = dict() + if cn in cnf[k][p]: + for cp in cnf[k][p][cn].keys(): + nc[k][p][cn][cp] = dict() + for ck in ("source", "destination"): + nc[k][p][cn][cp][ck] = n["defaults"][ + k + ][cn][ck] % { + "component": cp, + "name": cname, + "ref": "%(ref)s", + "stream": sname, + } + if ck in cnf[k][p][cn][cp]: + nc[k][p][cn][cp][ck] = cnf[k][p][ + cn + ][cp][ck] logger.info( "Found %d configured component(s) in the %s namespace.", len(nc[k]), @@ -489,9 +623,9 @@ def fetch_upstream_repo(ns, comp, csrc, sscm, repo): for attempt in range(retry): try: if sscm["ref"]: - repo.git.fetch("source", sscm["ref"]) + repo.git.fetch("--tags", "source", sscm["ref"]) else: - repo.git.fetch("--all") + repo.git.fetch("--tags", "--all") except Exception: logger.warning( "Fetching upstream attempt #%d/%d failed, retrying.", @@ -584,17 +718,45 @@ def sync_repo_merge(ns, comp, repo, bscm, sscm, dscm): break else: logger.error( - "Exhausted attempts finding an unused branch name while synchronizing %s/%s;" - "this is very rare, congratulations. Skipping.", + "Exhausted attempts finding an unused branch name while synchronizing %s/%s; " + "this is very rare, congratulations.", + ns, + comp, + ) + return None + + logger.debug( + "Locating build branch reference for %s/%s.", + ns, + comp, + ) + # if syncing a named branch present in both source and destination, make + # sure we merge from the source; otherwise it's likely a commit hash + for bref in ("source/{}".format(bscm["ref"]), bscm["ref"]): + try: + repo.git.rev_parse("--quiet", bref, "--") + break + except Exception: + continue + else: + logger.error( + "Cannot locate build branch reference while synchronizing %s/%s.", ns, comp, ) return None + logger.debug( + "Using build branch reference %s while synchronizing %s/%s.", + bref, + ns, + comp, + ) + try: actor = "{} <{}>".format( c["main"]["git"]["author"], c["main"]["git"]["email"] ) - repo.git.checkout(bscm["ref"]) + repo.git.checkout(bref) repo.git.switch("-c", bname) repo.git.merge( "--allow-unrelated-histories", @@ -648,7 +810,7 @@ def sync_repo_pull(ns, comp, repo, bscm): comp, ) try: - repo.git.pull("--ff-only", "source", bscm["ref"]) + repo.git.pull("--ff-only", "--tags", "source", bscm["ref"]) except Exception: logger.exception( "Failed to perform a clean pull for %s/%s, skipping.", ns, comp @@ -668,16 +830,23 @@ def repo_push(ns, comp, repo, dscm): :returns: repo, or None on error """ logger.debug("Pushing synchronized contents for %s/%s.", ns, comp) + for attempt in range(retry): try: if not dry_run: logger.debug("Pushing %s/%s.", ns, comp) - repo.git.push("--set-upstream", "origin", dscm["ref"]) + repo.git.push( + "--tags", "--set-upstream", "origin", dscm["ref"] + ) logger.debug("Successfully pushed %s/%s.", ns, comp) else: logger.debug("Pushing %s/%s (--dry-run).", ns, comp) repo.git.push( - "--dry-run", "--set-upstream", "origin", dscm["ref"] + "--dry-run", + "--tags", + "--set-upstream", + "origin", + dscm["ref"], ) logger.debug( "Successfully pushed %s/%s (--dry-run).", ns, comp @@ -697,17 +866,188 @@ def repo_push(ns, comp, repo, dscm): return None -def sync_repo(comp, ns="rpms", nvr=None): +def sync_module_components(comp, nvr, modulemd=None): + """Synchronizes the SCM repositories for the components of the given module. + + :param comp: The modular component name + :param nvr: NVR of module to synchronize + :param modulemd: Optional modulemd for module from build system + :returns: True if successful, or False on error + """ + logger.debug("Synchronizing components for module %s: %s", comp, nvr) + + if "main" not in c: + logger.critical("DistroBaker is not configured, aborting.") + return False + if nvr is None: + logger.error( + "NVR not specified for module %s", + comp, + ) + return False + if modulemd is None: + logger.debug( + "Retrieving modulemd for module %s: %s", + comp, + nvr, + ) + bsys = get_buildsys("source") + if bsys is None: + logger.error( + "Build system unavailable, cannot retrieve the module info for %s.", + nvr, + ) + return False + try: + bsrc = bsys.getBuild(nvr) + except Exception: + logger.exception( + "An error occured while retrieving the module info for %s.", + nvr, + ) + return False + try: + minfo = bsrc["extra"]["typeinfo"]["module"] + modulemd = minfo["modulemd_str"] + except Exception: + logger.error("Cannot retrieve module info for %s.", nvr) + return False + logger.debug("Modulemd for %s: %s", nvr, modulemd) + + mmd = Modulemd.read_packager_string(modulemd) + if not isinstance(mmd, Modulemd.ModuleStreamV2): + logger.error( + "Unable to parse module metadata string for %s: %s", nvr, modulemd + ) + return False + + gitdirs = dict(rpms=dict(), modules=dict()) + scmurls = dict(rpms=dict(), modules=dict()) + + mcomps = mmd.get_rpm_component_names() + logger.debug("Module has %d RPM components", len(mcomps)) + for mc in mcomps: + logger.debug("RPM component: %s", mc) + compinfo = mmd.get_rpm_component(mc) + crepo = compinfo.get_repository() + ccache = compinfo.get_cache() + cref = compinfo.get_ref() + # TODO: do we actually need the ref MBS stored in the xmd? + try: + xref = mmd.get_xmd()["mbs"]["rpms"][mc]["ref"] + except Exception: + xref = None + logger.debug(" repo: %s", crepo) + logger.debug(" cache: %s", ccache) + logger.debug(" ref: %s", cref) + logger.debug(" xmd ref: %s", xref) + gitdirs["rpms"][mc] = tempfile.TemporaryDirectory( + prefix="mcrepo-{}-{}-{}-".format(comp, "rpms", mc) + ) + logger.debug( + "Temporary directory created: %s", gitdirs["rpms"][mc].name + ) + + if cref is not None: + cscmurl = "{}#{}".format(crepo, cref) + else: + cscmurl = crepo + + scmurls["rpms"][mc] = sync_repo( + mc, + "rpms", + gitdir=gitdirs["rpms"][mc].name, + cmodule=comp, + scmurl=cscmurl, + bcache=ccache, + ) + if scmurls["rpms"][mc] is None: + logger.error( + "Synchronization of component %s/%s failed, aborting module sync.", + "rpms", + mc, + ) + return False + + mcomps = mmd.get_module_component_names() + logger.debug("Module has %d module components", len(mcomps)) + for mc in mcomps: + logger.debug("Module component: %s", mc) + compinfo = mmd.get_module_component(mc) + crepo = compinfo.get_repository() + cref = compinfo.get_ref() + # TODO: do we actually need the ref MBS stored in the xmd? + # does it even exist for bundled modules? + try: + xref = mmd.get_xmd()["mbs"]["modules"][mc]["ref"] + except Exception: + xref = None + logger.debug(" repo: %s", crepo) + logger.debug(" ref: %s", cref) + logger.debug(" xmd ref: %s", xref) + gitdirs["modules"][mc] = tempfile.TemporaryDirectory( + prefix="mcrepo-{}-{}-{}-".format(comp, "modules", mc) + ) + logger.debug( + "Temporary directory created: %s", gitdirs["modules"][mc].name + ) + # TODO some day: implement syncing of module component repos + scmurls["modules"][mc] = None # sync_repo(...) + logger.critical( + "Module %s: synchronization not yet implemented for component module %s, aborting.", + comp, + mc, + ) + return True + + # if all the component syncs succeeded, push all the repos + for ns in ("rpms", "modules"): + for mc in gitdirs[ns].keys(): + repo = git.Repo(gitdirs[ns][mc].name) + dscm = split_scmurl(scmurls[ns][mc]) + if repo_push(ns, mc, repo, dscm) is None: + logger.error( + "Module %s: failed to push component %s/%s, skipping.", + comp, + ns, + mc, + ) + return False + + return True + + +def sync_repo( + comp, + ns="rpms", + nvr=None, + gitdir=None, + cmodule=None, + scmurl=None, + bcache=None, +): """Synchronizes the component SCM repository for the given NVR. If no NVR is provided, finds the latest build in the corresponding trigger tag. Calls sync_cache() if required. Does not call build_comp(). - :param comp: The component name - :param ns: The component namespace - :param nvr: Optional NVR to synchronize - :returns: The SCM reference of the final synchronized commit, or None on error + :param comp: The component name. + :param ns: The component namespace. + :param nvr: Optional NVR to synchronize. + :param gitdir: Optional empty directory to use as git repository directory + which will NOT be pushed. If not specified, a temporary git repository + directory will be created and the repository WILL be pushed. + :param cmodule: Optional containing module name:stream. Must be specified + if and only if syncing module RPM components. + :param scmurl: Optional URL of custom source component repository. Must be + specified if and only if syncing module RPM components. If not specified, the + configuration default location is used. + :param bcache: Optional URL of custom source lookaside cache. If not + specified, the configuration default location is used. + :returns: The desination SCM URL of the final synchronized commit (if + gitdir not specified) or branch to push to (if gitdir provided). None on + error. """ if "main" not in c: logger.critical("DistroBaker is not configured, aborting.") @@ -720,42 +1060,108 @@ def sync_repo(comp, ns="rpms", nvr=None): logger.info("Synchronizing SCM for %s/%s.", ns, comp) - nvr = nvr if nvr else get_build(comp, ns=ns) - if nvr is None: - logger.error( - "NVR not specified and no builds for %s/%s could be found, skipping.", - ns, - comp, - ) - return None + if scmurl: + bscmurl = scmurl + bmmd = None + else: + nvr = nvr if nvr else get_build(comp, ns=ns) + if nvr is None: + logger.error( + "NVR not specified and no builds for %s/%s could be found, skipping.", + ns, + comp, + ) + return None + binfo = get_build_info(nvr) + if binfo is None: + logger.error( + "Could not find build SCMURL for %s/%s: %s, skipping.", + ns, + comp, + nvr, + ) + return None + bscmurl = binfo["scmurl"] + bmmd = binfo["modulemd"] + + bscm = split_scmurl(bscmurl) + bscm["ref"] = bscm["ref"] if bscm["ref"] else "master" + + if scmurl: + if bscm["link"] != c["main"]["source"]["scm"]: + # TODO: this never matches; make the check useful + logger.warning( + "The custom source SCM URL for %s/%s (%s) doesn't match " + "configuration (%s), ignoring.", + ns, + comp, + bscm["link"], + c["main"]["source"]["scm"], + ) + + if cmodule and nvr is None: + # when syncing module RPM components, assign a dummy nvr in comp:branch + # format that is used only for log messages + nvr = "{}:{}".format(comp, bscm["ref"]) logger.debug("Processing %s/%s: %s", ns, comp, nvr) - tempdir = tempfile.TemporaryDirectory( - prefix="repo-{}-{}-".format(ns, comp) - ) - logger.debug("Temporary directory created: %s", tempdir.name) + logger.debug("Build SCMURL for %s/%s: %s", ns, comp, bscmurl) - bscm = get_scmurl(nvr) - if bscm is None: - logger.error( - "Could not find build SCMURL for %s/%s: %s, skipping.", - ns, - comp, - nvr, - ) - return None - bscm = split_scmurl(bscm) - if comp in c["comps"][ns]: - csrc = c["comps"][ns][comp]["source"] - cdst = c["comps"][ns][comp]["destination"] + if ns == "modules": + ms = split_module(comp) + cname = ms["name"] + sname = ms["stream"] else: cname = comp sname = "" + + if cmodule: if ns == "modules": - ms = split_module(comp) - cname = ms["name"] - sname = ms["stream"] + logger.critical( + "Synchronizing module subcomponent (%s/%s) of module (%s) is not yet supported.", + ns, + comp, + cmodule, + ) + return None + + # check for module subcomponent overrides + if ( + cmodule in c["comps"]["modules"] + and comp in c["comps"]["modules"][cmodule][ns] + ): + csrc = c["comps"]["modules"][cmodule][ns][comp]["source"] + cdst = c["comps"]["modules"][cmodule][ns][comp]["destination"] + else: + csrc = c["main"]["defaults"]["modules"][ns]["source"] + cdst = c["main"]["defaults"]["modules"][ns]["destination"] + + # append #ref if not already present + if "#" not in csrc: + csrc += "#%(ref)s" + if "#" not in cdst: + cdst += "#%(ref)s" + + # when syncing module RPM components, ref is the stream branch from build + # TODO: do we also need a mapped key for the component's stream? + cms = split_module(cmodule) + csrc = csrc % { + "component": cname, + "name": cms["name"], + "ref": bscm["ref"], + "stream": cms["stream"], + } + cdst = cdst % { + "component": cname, + "name": cms["name"], + "ref": bscm["ref"], + "stream": cms["stream"], + } + elif comp in c["comps"][ns]: + csrc = c["comps"][ns][comp]["source"] + cdst = c["comps"][ns][comp]["destination"] + else: csrc = c["main"]["defaults"][ns]["source"] % { "component": cname, "stream": sname, @@ -772,7 +1178,20 @@ def sync_repo(comp, ns="rpms", nvr=None): ) dscm["ref"] = dscm["ref"] if dscm["ref"] else "master" - repo = clone_destination_repo(ns, comp, cdst, dscm, tempdir.name) + if gitdir: + # if a git repo directory was provided, don't do pushes since they + # will be handled by the caller + pushrepo = False + else: + tempdir = tempfile.TemporaryDirectory( + prefix="repo-{}-{}-".format(ns, comp) + ) + logger.debug("Temporary directory created: %s", tempdir.name) + gitdir = tempdir.name + pushrepo = True + logger.debug("Using git repository directory: %s", gitdir) + + repo = clone_destination_repo(ns, comp, cdst, dscm, gitdir) if repo is None: logger.error( "Failed to clone destination repo for %s/%s, skipping.", ns, comp @@ -830,7 +1249,7 @@ def sync_repo(comp, ns="rpms", nvr=None): srcdiff = ssrc - dsrc if srcdiff: logger.debug("Source files for %s/%s differ.", ns, comp) - if sync_cache(comp, srcdiff, ns) is None: + if sync_cache(comp, srcdiff, ns, scacheurl=bcache) is None: logger.error( "Failed to synchronize sources for %s/%s, skipping.", ns, comp ) @@ -840,15 +1259,27 @@ def sync_repo(comp, ns="rpms", nvr=None): logger.debug("Component %s/%s successfully synchronized.", ns, comp) - if repo_push(ns, comp, repo, dscm) is None: - logger.error("Failed to push %s/%s, skipping.", ns, comp) - return None + if ns == "modules": + if not sync_module_components(comp, nvr, bmmd): + logger.error( + "Failed to sync module components for %s/%s, skipping.", + ns, + comp, + ) + return None - logger.info("Successfully synchronized %s/%s.", ns, comp) - return repo.git.rev_parse("HEAD") + if pushrepo: + if repo_push(ns, comp, repo, dscm) is None: + logger.error("Failed to push %s/%s, skipping.", ns, comp) + return None + logger.info("Successfully synchronized %s/%s.", ns, comp) + return "{}#{}".format(dscm["link"], repo.git.rev_parse("HEAD")) + else: + logger.info("Successfully synchronized %s/%s without push", ns, comp) + return "{}#{}".format(dscm["link"], dscm["ref"]) -def sync_cache(comp, sources, ns="rpms"): +def sync_cache(comp, sources, ns="rpms", scacheurl=None): """Synchronizes lookaside cache contents for the given component. Expects a set of (filename, hash, hastype) tuples to synchronize, as returned by parse_sources(). @@ -856,6 +1287,8 @@ def sync_cache(comp, sources, ns="rpms"): :param comp: The component name :param sources: The set of source tuples :param ns: The component namespace + :param scacheurl: Optional source lookaside cache url for modular RPM + components :returns: The number of files processed, or None on error """ if "main" not in c: @@ -869,6 +1302,16 @@ def sync_cache(comp, sources, ns="rpms"): logger.debug( "Synchronizing %d cache file(s) for %s/%s.", len(sources), ns, comp ) + if scacheurl: + if scacheurl != c["main"]["source"]["cache"]["url"]: + logger.warning( + "The custom source lookaside cache URL for %s/%s (%s) doesn't " + "match configuration (%s), ignoring.", + ns, + comp, + scacheurl, + c["main"]["source"]["cache"]["url"], + ) scache = pyrpkg.lookaside.CGILookasideCache( "sha512", c["main"]["source"]["cache"]["url"], @@ -994,7 +1437,8 @@ def build_comp(comp, ref, ns="rpms"): :param comp: The component name :param ref: The SCM reference :param ns: The component namespace - :returns: The build system task ID, or None on error + :returns: The build system task ID for RPMS, the module build ID for + modules, or None on error """ if "main" not in c: logger.critical("DistroBaker is not configured, aborting.") @@ -1005,67 +1449,177 @@ def build_comp(comp, ref, ns="rpms"): ) return None logger.info("Processing build for %s/%s.", ns, comp) - if ns == "rpms": + if not dry_run: bsys = get_buildsys("destination") - buildcomp = comp - if comp in c["comps"][ns]: - buildcomp = split_scmurl(c["comps"][ns][comp]["destination"])[ - "comp" - ] + buildcomp = comp + if comp in c["comps"][ns]: + buildcomp = split_scmurl(c["comps"][ns][comp]["destination"])["comp"] + buildscmurl = "{}/{}/{}#{}".format( + c["main"]["build"]["prefix"], ns, buildcomp, ref + ) + if ns == "rpms": try: if not dry_run: task = bsys.build( - "{}/{}/{}#{}".format( - c["main"]["build"]["prefix"], ns, buildcomp, ref - ), + buildscmurl, c["main"]["build"]["target"], {"scratch": c["main"]["build"]["scratch"]}, ) logger.debug( - "Build submitted for %s/%s; task %d; SCMURL: %s/%s/%s#%s.", + "Build submitted for %s/%s; task %d; SCMURL: %s.", ns, comp, task, - c["main"]["build"]["prefix"], - ns, - buildcomp, - ref, + buildscmurl, ) else: task = 0 logger.info( - "Running in the dry mode, not submitting any builds for %s/%s (%s/%s/%s#%s).", + "Running in the dry mode, not submitting any builds for %s/%s (%s).", ns, comp, - c["main"]["build"]["prefix"], - ns, - buildcomp, - ref, + buildscmurl, ) return task except Exception: logger.exception( - "Failed submitting build for %s/%s (%s/%s/%s#%s).", + "Failed submitting build for %s/%s (%s).", ns, comp, - c["main"]["build"]["prefix"], - ns, - comp, - ref, + buildscmurl, ) return None elif ns == "modules": - logger.critical( - "Cannot build %s/%s; module building not implemented.", ns, comp + ms = split_module(comp) + ps = split_module(c["main"]["build"]["platform"]) + body = { + "scmurl": buildscmurl, + "branch": ms["stream"], + "buildrequire_overrides": {ps["name"]: [ps["stream"]]}, + "scratch": c["main"]["build"]["scratch"], + } + request_url = "{}/{}/".format( + c["main"]["destination"]["mbs"]["api_url"], "module-builds" ) - return None + logger.debug( + "Body of build request for %s/%s to POST to %s using auth_method %s: %s", + ns, + comp, + request_url, + c["main"]["destination"]["mbs"]["auth_method"], + body, + ) + + if not dry_run: + if c["main"]["destination"]["mbs"]["auth_method"] == "kerberos": + try: + import requests_kerberos + + data = json.dumps(body) + auth = requests_kerberos.HTTPKerberosAuth( + mutual_authentication=requests_kerberos.OPTIONAL, + ) + resp = requests.post(request_url, data=data, auth=auth) + except Exception: + logger.exception( + "Failed submitting build for %s/%s (%s).", + ns, + comp, + buildscmurl, + ) + return None + + elif c["main"]["destination"]["mbs"]["auth_method"] == "oidc": + try: + import openidc_client + + mapping = { + "Token": "Token", + "Authorization": "Authorization", + } + # Get the auth token using the OpenID client + oidc = openidc_client.OpenIDCClient( + "mbs_build", + c["main"]["destination"]["mbs"]["oidc_id_provider"], + mapping, + c["main"]["destination"]["mbs"]["oidc_client_id"], + c["main"]["destination"]["mbs"]["oidc_client_secret"], + ) + resp = oidc.send_request( + request_url, + http_method="POST", + json=body, + scopes=c["main"]["destination"]["mbs"]["oidc_scopes"], + ) + except Exception: + logger.exception( + "Failed submitting build for %s/%s (%s).", + ns, + comp, + buildscmurl, + ) + return None + else: + logger.critical( + "Cannot build %s/%s; unknown auth_method: %s", + ns, + comp, + c["main"]["destination"]["mbs"]["auth_method"], + ) + return None + + logger.debug( + "Build request for %s/%s (%s) returned status %d.", + ns, + comp, + buildscmurl, + resp.status_code, + ) + if resp.status_code == 401: + logger.critical( + "Cannot build %s/%s: MBS authentication failed using auth_method %s. " + "Make sure you have a valid ticket/token.", + ns, + comp, + c["main"]["destination"]["mbs"]["auth_method"], + ) + return None + elif not resp.ok: + logger.critical( + "Cannot build %s/%s: request failed with: %s", + ns, + comp, + resp.text, + ) + return None + + rdata = resp.json() + build = rdata[0] if isinstance(rdata, list) else rdata + buildid = build["id"] + logger.debug( + "Build submitted for %s/%s; buildid %d; SCMURL: %s.", + ns, + comp, + buildid, + buildscmurl, + ) + return buildid + + else: + logger.info( + "Running in the dry mode, not submitting any builds for %s/%s (%s).", + ns, + comp, + buildscmurl, + ) + return 0 else: logger.critical("Cannot build %s/%s; unknown namespace.", ns, comp) return None def process_message(msg): - """Processes a fedora-messaging messages. We can only handle Koji + """Processes a fedora-messaging message. We can only handle Koji tagging events; messaging should be configured properly. If the message is recognized and matches our configuration or mode, @@ -1090,55 +1644,79 @@ def process_message(msg): except Exception: logger.exception("Failed to process the message: %s", msg) return None + if tag == c["main"]["trigger"]["rpms"]: + ns = "rpms" logger.debug( "Message tag configured as an RPM trigger, processing." ) + elif tag == c["main"]["trigger"]["modules"]: + ns = "modules" + logger.debug( + "Message tag configured as a Module trigger, processing." + ) + # get un-mangled name:stream for nvr + binfo = get_build_info(nvr) if ( - comp in c["comps"]["rpms"] - or not c["main"]["control"]["strict"] + binfo is None + or binfo["name"] is None + or binfo["stream"] is None ): + logger.error( + "Could not retrieve module build info for %s, skipping.", + nvr, + ) + return None + bcomp = "{}:{}".format(binfo["name"], binfo["stream"]) + if comp != bcomp: + logger.debug( + "Using unmangled component name: %s", + comp, + ) + comp = bcomp + else: + logger.debug("Message tag not configured as a trigger, ignoring.") + return None + + if comp in c["comps"][ns] or not c["main"]["control"]["strict"]: + logger.info("Handling trigger for %s/%s, tag %s.", ns, comp, tag) + if comp in c["main"]["control"]["exclude"][ns]: logger.info( - "Handling an RPM trigger for %s, tag %s.", comp, tag + "The %s/%s component is excluded from sync, skipping.", + ns, + comp, ) - if comp in c["main"]["control"]["exclude"]["rpms"]: + return None + scmurl = sync_repo(comp, ns=ns, nvr=nvr) + if scmurl is not None: + scm = split_scmurl(scmurl) + task = build_comp(comp, scm["ref"], ns=ns) + if task is not None: logger.info( - "The rpms/%s component is excluded from sync, skipping.", + "Build submission of %s/%s complete, task %s, trigger processed.", + ns, comp, + task, ) - return None - ref = sync_repo(comp, ns="rpms", nvr=nvr) - if ref is not None: - task = build_comp(comp, ref, ns="rpms") - if task is not None: - logger.info( - "Build submission of rpms/%s complete, task %s, trigger processed.", - comp, - task, - ) - else: - logger.error( - "Build submission of rpms/%s failed, aborting.trigger.", - comp, - ) else: logger.error( - "Synchronization of rpms/%s failed, aborting trigger.", + "Build submission of %s/%s failed, aborting trigger.", + ns, comp, ) else: - logger.debug( - "RPM component %s not configured for sync and the strict " - "mode is enabled, ignoring.", + logger.error( + "Synchronization of %s/%s failed, aborting trigger.", + ns, comp, ) - elif tag == c["main"]["trigger"]["modules"]: - logger.error( - "The message matches our module configuration but module " - "building not implemented, ignoring." - ) else: - logger.debug("Message tag not configured as a trigger, ignoring.") + logger.debug( + "Component %s/%s not configured for sync and the strict " + "mode is enabled, ignoring.", + ns, + comp, + ) else: logger.warning("Unable to handle %s topics, ignoring.", msg.topic) return None @@ -1151,9 +1729,34 @@ def process_components(compset): :param compset: A set of components to process in the `ns/comp` form :returns: None """ + if not isinstance(compset, set): + logger.critical("process_components() must be passed a set.") + return None if "main" not in c: logger.critical("DistroBaker is not configured, aborting.") return None + + # Generate a dictionary (key module:stream, value nvr) of all of the latest + # modular builds for the source tag. + # Note: Querying tagged modules with latest=True only returns the latest + # module tagged by name without regard to stream. So, we need need to query + # everything to figure out the latest per stream ourselves. It helps that + # the list returned by Koji is ordered so the most recently tagged builds + # are at the end of the list. This also fetches and uses the actual + # un-mangled name and stream for each module. + latest = dict() + for x in get_buildsys("source").listTagged( + c["main"]["trigger"]["modules"], + ): + binfo = get_build_info(x["nvr"]) + if binfo is None or binfo["name"] is None or binfo["stream"] is None: + logger.error( + "Could not get module info for %s, skipping.", + x["nvr"], + ) + else: + latest["{}:{}".format(binfo["name"], binfo["stream"])] = x["nvr"] + if not compset: logger.debug( "No components selected, gathering components from triggers." @@ -1164,13 +1767,9 @@ def process_components(compset): c["main"]["trigger"]["rpms"], latest=True ) ) - compset.update( - "{}/{}:{}".format("modules", x["package_name"], x["version"]) - for x in get_buildsys("source").listTagged( - c["main"]["trigger"]["modules"], latest=True - ) - ) + compset.update("{}/{}".format("modules", x) for x in latest.keys()) logger.info("Processing %d component(s).", len(compset)) + processed = 0 for rec in sorted(compset, key=str.lower): m = cre.match(rec) @@ -1179,13 +1778,6 @@ def process_components(compset): continue m = m.groupdict() logger.info("Processing %s.", rec) - if m["namespace"] == "modules": - logger.warning( - "The modules/%s component is a module; modules currently not " - "implemented, skipping.", - m["component"], - ) - continue if m["component"] in c["main"]["control"]["exclude"][m["namespace"]]: logger.info( "The %s/%s component is excluded from sync, skipping.", @@ -1203,9 +1795,14 @@ def process_components(compset): m["component"], ) continue - ref = sync_repo(comp=m["component"], ns=m["namespace"]) - if ref is not None: - build_comp(comp=m["component"], ref=ref, ns=m["namespace"]) + scmurl = sync_repo( + comp=m["component"], + ns=m["namespace"], + nvr=latest.get(m["component"]), + ) + if scmurl is not None: + scm = split_scmurl(scmurl) + build_comp(comp=m["component"], ref=scm["ref"], ns=m["namespace"]) logger.info("Done processing %s.", rec) processed += 1 logger.info( @@ -1216,11 +1813,13 @@ def process_components(compset): return None -def get_scmurl(nvr): - """Get SCMURL for a source build system build NVR. NVRs are unique. +def get_build_info(nvr): + """Get SCMURL, plus extra attributes for modules, for a source build system + build NVR. NVRs are unique. :param nvr: The build NVR to look up - :returns: The build SCMURL, or None on error + :returns: A dictionary with `scmurl`, `name`, `stream`, and `modulemd` keys, + or None on error """ if "main" not in c: logger.critical("DistroBaker is not configured, aborting.") @@ -1228,23 +1827,41 @@ def get_scmurl(nvr): bsys = get_buildsys("source") if bsys is None: logger.error( - "Build system unavailable, cannot retrieve the SCMURL of %s.", nvr + "Build system unavailable, cannot retrieve the build info of %s.", + nvr, ) return None try: bsrc = bsys.getBuild(nvr) except Exception: logger.exception( - "An error occured while retrieving the SCMURL for %s.", nvr + "An error occured while retrieving the build info for %s.", nvr ) return None + + bi = dict() if "source" in bsrc: - bsrc = bsrc["source"] - logger.debug("Retrieved SCMURL for %s: %s", nvr, bsrc) + bi["scmurl"] = bsrc["source"] + logger.debug("Retrieved SCMURL for %s: %s", nvr, bi["scmurl"]) else: - bsrc = None - logger.error("Cannot find any SCMURLs associated with %s.", nvr) - return bsrc + logger.error("Cannot find any SCMURL associated with %s.", nvr) + return None + + try: + minfo = bsrc["extra"]["typeinfo"]["module"] + bi["name"] = minfo["name"] + bi["stream"] = minfo["stream"] + bi["modulemd"] = minfo["modulemd_str"] + logger.debug( + "Actual name:stream for %s is %s:%s", nvr, bi["name"], bi["stream"] + ) + except Exception: + bi["name"] = None + bi["stream"] = None + bi["modulemd"] = None + logger.debug("No module info for %s.", nvr) + + return bi def get_build(comp, ns="rpms"): @@ -1267,6 +1884,7 @@ def get_build(comp, ns="rpms"): comp, ) return None + if ns == "rpms": try: nvr = bsys.listTagged( @@ -1289,14 +1907,55 @@ def get_build(comp, ns="rpms"): return nvr[0]["nvr"] logger.error("Did not find any builds for %s/%s.", ns, comp) return None + if ns == "modules": - logger.error( - "Modules not implemented, cannot get the latest build for %s/%s.", + ms = split_module(comp) + cname = ms["name"] + sname = ms["stream"] + try: + builds = bsys.listTagged( + c["main"]["trigger"][ns], + ) + except Exception: + logger.exception( + "An error occured while getting the latest builds for %s/%s.", + ns, + cname, + ) + return None + if not builds: + logger.error("Did not find any builds for %s/%s.", ns, cname) + return None + logger.debug( + "Found %d total builds for %s/%s", + len(builds), ns, - comp, + cname, ) - else: - logger.error("Unrecognized namespace: %s/%s", ns, comp) + # find the latest build for name:stream + latest = None + for b in builds: + binfo = get_build_info(b["nvr"]) + if ( + binfo is None + or binfo["name"] is None + or binfo["stream"] is None + ): + logger.error( + "Could not get module info for %s, skipping.", + b["nvr"], + ) + elif cname == binfo["name"] and sname == binfo["stream"]: + latest = b["nvr"] + if latest: + logger.debug( + "Located the latest build for %s/%s: %s", ns, comp, latest + ) + return latest + logger.error("Did not find any builds for %s/%s.", ns, comp) + return None + + logger.error("Unrecognized namespace: %s/%s", ns, comp) return None diff --git a/requirements.txt b/requirements.txt index 7f14012..4b69ad4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,10 @@ fedora_messaging>=2.0.2 gitpython>=3.1.9 gunicorn>=20.0.4 koji>=1.22.1 +openidc_client +pygobject pyyaml>=5.3.1 regex>=2020.10.11 +requests_kerberos rpkg>=1.61 rpm-py-installer>=1.0.0 - diff --git a/test-requirements.txt b/test-requirements.txt index eb891c6..bb67c5f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,2 +1,3 @@ +mock pytest parameterized diff --git a/tests/data/config/distrobaker-dest-mbs-not-mapping.yaml b/tests/data/config/distrobaker-dest-mbs-not-mapping.yaml new file mode 100644 index 0000000..c7091a1 --- /dev/null +++ b/tests/data/config/distrobaker-dest-mbs-not-mapping.yaml @@ -0,0 +1,74 @@ +configuration: + source: + scm: https://src.fedoraproject.org/ + cache: + url: https://src.fedoraproject.org/repo/pkgs + cgi: https://src.fedoraproject.org/repo/pkgs/upload.cgi + path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" + profile: koji + destination: + scm: ssh://pkgs.example.com/ + cache: + url: http://pkgs.example.com/repo + cgi: http://pkgs.example.com/lookaside/upload.cgi + path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" + profile: brew + mbs: https://mbs.example.com/ + trigger: + rpms: rawhide + modules: rawhide-modular + build: + prefix: git://pkgs.example.com/ + target: fluff-42.0.0-alpha-candidate + scratch: false + platform: platform:fl42 + git: + author: DistroBaker + email: noreply@example.com + message: > + Merged update from upstream sources + + This is an automated DistroBaker update from upstream sources. If you do not + know what this is about or would like to opt out, contact the DistroBaker maintainers. + control: + strict: false + build: true + merge: true + exclude: + rpms: + - firefox + - kernel + - thunderbird + modules: + - testmodule2:master + defaults: + rpms: + source: "%(component)s.git" + destination: "%(component)s.git#fluff-42.0.0-alpha" + modules: + source: "%(component)s.git#%(stream)s" + destination: "%(component)s.git#%(stream)s-fluff-42.0.0-alpha" + rpms: + source: "%(component)s.git" + destination: "%(component)s.git#stream-%(name)s-%(stream)s" + cache: + source: "%(component)s" + destination: "%(component)s" +components: + rpms: + gzip: + source: gzip.git + destination: gzip.git#fluff-42.0.0-alpha-experimental + ipa: + source: freeipa.git#f33 + cache: + source: freeipa + destination: ipa + modules: + testmodule:master: + destination: testmodule#stream-master-fluff-42.0.0-alpha-experimental + rpms: + componentrpm: + source: componentsource.git#sourcebranch + destination: coomponentrpm.git#fluff-42.0.0-alpha-experimental + anotherrpm: {} diff --git a/tests/data/config/distrobaker-extraneous-source-mbs.yaml b/tests/data/config/distrobaker-extraneous-source-mbs.yaml new file mode 100644 index 0000000..a9fa325 --- /dev/null +++ b/tests/data/config/distrobaker-extraneous-source-mbs.yaml @@ -0,0 +1,84 @@ +configuration: + source: + scm: https://src.fedoraproject.org/ + cache: + url: https://src.fedoraproject.org/repo/pkgs + cgi: https://src.fedoraproject.org/repo/pkgs/upload.cgi + path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" + profile: koji + mbs: https://this.needs.to.be.ignored + destination: + scm: ssh://pkgs.example.com/ + cache: + url: http://pkgs.example.com/repo + cgi: http://pkgs.example.com/lookaside/upload.cgi + path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" + profile: brew + mbs: + api_url: https://mbs.example.com/module-build-service/1/ + auth_method: oidc + oidc_id_provider: https://id.example.com/openidc/ + oidc_client_id: mbs-authorizer + oidc_client_secret: notsecret + oidc_scopes: + - openid + - https://id.example.com/scope/groups + - https://mbs.example.com/oidc/submit-build + trigger: + rpms: rawhide + modules: rawhide-modular + build: + prefix: git://pkgs.example.com/ + target: fluff-42.0.0-alpha-candidate + scratch: false + platform: platform:fl42 + git: + author: DistroBaker + email: noreply@example.com + message: > + Merged update from upstream sources + + This is an automated DistroBaker update from upstream sources. If you do not + know what this is about or would like to opt out, contact the DistroBaker maintainers. + control: + strict: false + build: true + merge: true + exclude: + rpms: + - firefox + - kernel + - thunderbird + modules: + - testmodule2:master + defaults: + rpms: + source: "%(component)s.git" + destination: "%(component)s.git#fluff-42.0.0-alpha" + modules: + source: "%(component)s.git#%(stream)s" + destination: "%(component)s.git#%(stream)s-fluff-42.0.0-alpha" + rpms: + source: "%(component)s.git" + destination: "%(component)s.git#stream-%(name)s-%(stream)s" + cache: + source: "%(component)s" + destination: "%(component)s" +components: + rpms: + gzip: + source: gzip.git + destination: gzip.git#fluff-42.0.0-alpha-experimental + ipa: + source: freeipa.git#f33 + cache: + source: freeipa + destination: ipa + modules: + testmodule:master: + destination: testmodule#stream-master-fluff-42.0.0-alpha-experimental + rpms: + componentrpm: + source: componentsource.git#sourcebranch + destination: coomponentrpm.git#fluff-42.0.0-alpha-experimental + anotherrpm: {} diff --git a/tests/data/config/distrobaker-missing-dest-mbs.yaml b/tests/data/config/distrobaker-missing-dest-mbs.yaml new file mode 100644 index 0000000..60dcb1c --- /dev/null +++ b/tests/data/config/distrobaker-missing-dest-mbs.yaml @@ -0,0 +1,73 @@ +configuration: + source: + scm: https://src.fedoraproject.org/ + cache: + url: https://src.fedoraproject.org/repo/pkgs + cgi: https://src.fedoraproject.org/repo/pkgs/upload.cgi + path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" + profile: koji + destination: + scm: ssh://pkgs.example.com/ + cache: + url: http://pkgs.example.com/repo + cgi: http://pkgs.example.com/lookaside/upload.cgi + path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" + profile: brew + trigger: + rpms: rawhide + modules: rawhide-modular + build: + prefix: git://pkgs.example.com/ + target: fluff-42.0.0-alpha-candidate + scratch: false + platform: platform:fl42 + git: + author: DistroBaker + email: noreply@example.com + message: > + Merged update from upstream sources + + This is an automated DistroBaker update from upstream sources. If you do not + know what this is about or would like to opt out, contact the DistroBaker maintainers. + control: + strict: false + build: true + merge: true + exclude: + rpms: + - firefox + - kernel + - thunderbird + modules: + - testmodule2:master + defaults: + rpms: + source: "%(component)s.git" + destination: "%(component)s.git#fluff-42.0.0-alpha" + modules: + source: "%(component)s.git#%(stream)s" + destination: "%(component)s.git#%(stream)s-fluff-42.0.0-alpha" + rpms: + source: "%(component)s.git" + destination: "%(component)s.git#stream-%(name)s-%(stream)s" + cache: + source: "%(component)s" + destination: "%(component)s" +components: + rpms: + gzip: + source: gzip.git + destination: gzip.git#fluff-42.0.0-alpha-experimental + ipa: + source: freeipa.git#f33 + cache: + source: freeipa + destination: ipa + modules: + testmodule:master: + destination: testmodule#stream-master-fluff-42.0.0-alpha-experimental + rpms: + componentrpm: + source: componentsource.git#sourcebranch + destination: coomponentrpm.git#fluff-42.0.0-alpha-experimental + anotherrpm: {} diff --git a/tests/data/config/distrobaker-no-source-profile.yaml b/tests/data/config/distrobaker-no-source-profile.yaml index be469a0..656e9c4 100644 --- a/tests/data/config/distrobaker-no-source-profile.yaml +++ b/tests/data/config/distrobaker-no-source-profile.yaml @@ -5,7 +5,6 @@ configuration: url: https://src.fedoraproject.org/repo/pkgs cgi: https://src.fedoraproject.org/repo/pkgs/upload.cgi path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" - mbs: https://mbs.fedoraproject.org destination: scm: ssh://pkgs.example.com/ cache: @@ -13,7 +12,16 @@ configuration: cgi: http://pkgs.example.com/lookaside/upload.cgi path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" profile: brew - mbs: https://mbs.example.com + mbs: + api_url: https://mbs.example.com/module-build-service/1/ + auth_method: oidc + oidc_id_provider: https://id.example.com/openidc/ + oidc_client_id: mbs-authorizer + oidc_client_secret: notsecret + oidc_scopes: + - openid + - https://id.example.com/scope/groups + - https://mbs.example.com/oidc/submit-build trigger: rpms: rawhide modules: rawhide-modular @@ -21,6 +29,7 @@ configuration: prefix: git://pkgs.example.com/ target: fluff-42.0.0-alpha-candidate scratch: false + platform: platform:fl42 git: author: DistroBaker email: noreply@example.com diff --git a/tests/data/config/distrobaker-no-trigger.yaml b/tests/data/config/distrobaker-no-trigger.yaml index d4ecb63..4ddd83c 100644 --- a/tests/data/config/distrobaker-no-trigger.yaml +++ b/tests/data/config/distrobaker-no-trigger.yaml @@ -6,7 +6,6 @@ configuration: cgi: https://src.fedoraproject.org/repo/pkgs/upload.cgi path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" profile: koji - mbs: https://mbs.fedoraproject.org destination: scm: ssh://pkgs.example.com/ cache: @@ -14,11 +13,21 @@ configuration: cgi: http://pkgs.example.com/lookaside/upload.cgi path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" profile: brew - mbs: https://mbs.example.com + mbs: + api_url: https://mbs.example.com/module-build-service/1/ + auth_method: oidc + oidc_id_provider: https://id.example.com/openidc/ + oidc_client_id: mbs-authorizer + oidc_client_secret: notsecret + oidc_scopes: + - openid + - https://id.example.com/scope/groups + - https://mbs.example.com/oidc/submit-build build: prefix: git://pkgs.example.com/ target: fluff-42.0.0-alpha-candidate scratch: false + platform: platform:fl42 git: author: DistroBaker email: noreply@example.com diff --git a/tests/data/config/distrobaker-process_components.yaml b/tests/data/config/distrobaker-process_components.yaml new file mode 100644 index 0000000..4fbe1eb --- /dev/null +++ b/tests/data/config/distrobaker-process_components.yaml @@ -0,0 +1,75 @@ +configuration: + source: + scm: https://src.fedoraproject.org/ + cache: + url: https://src.fedoraproject.org/repo/pkgs + cgi: https://src.fedoraproject.org/repo/pkgs/upload.cgi + path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" + profile: koji + destination: + scm: ssh://pkgs.example.com/ + cache: + url: http://pkgs.example.com/repo + cgi: http://pkgs.example.com/lookaside/upload.cgi + path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" + profile: brew + mbs: + api_url: https://mbs.example.com/module-build-service/1/ + auth_method: oidc + oidc_id_provider: https://id.example.com/openidc/ + oidc_client_id: mbs-authorizer + oidc_client_secret: notsecret + oidc_scopes: + - openid + - https://id.example.com/scope/groups + - https://mbs.example.com/oidc/submit-build + trigger: + rpms: rawhide + modules: rawhide-modular + build: + prefix: git://pkgs.example.com/ + target: fluff-42.0.0-alpha-candidate + scratch: false + platform: platform:fl42 + git: + author: DistroBaker + email: noreply@example.com + message: > + Merged update from upstream sources + + This is an automated DistroBaker update from upstream sources. If you do not + know what this is about or would like to opt out, contact the DistroBaker maintainers. + control: + strict: false + build: true + merge: true + exclude: + rpms: + - firefox + - kernel + - thunderbird + modules: + - testmodule2:master + defaults: + rpms: + source: "%(component)s.git" + destination: "%(component)s.git#fluff-42.0.0-alpha" + modules: + source: "%(component)s.git#%(stream)s" + destination: "%(component)s.git#%(stream)s-fluff-42.0.0-alpha" + cache: + source: "%(component)s" + destination: "%(component)s" +components: + rpms: + gzip: + source: gzip.git + destination: gzip.git#fluff-42.0.0-alpha-experimental + ipa: + source: freeipa.git#f33 + cache: + source: freeipa + destination: ipa + modules: + testmodule:master: + destination: testmodule#stream-master-fluff-42.0.0-alpha-experimental diff --git a/tests/data/config/distrobaker.yaml b/tests/data/config/distrobaker.yaml index e36deda..e22e731 100644 --- a/tests/data/config/distrobaker.yaml +++ b/tests/data/config/distrobaker.yaml @@ -6,7 +6,6 @@ configuration: cgi: https://src.fedoraproject.org/repo/pkgs/upload.cgi path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" profile: koji - mbs: https://mbs.fedoraproject.org destination: scm: ssh://pkgs.example.com/ cache: @@ -14,7 +13,16 @@ configuration: cgi: http://pkgs.example.com/lookaside/upload.cgi path: "%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s" profile: brew - mbs: https://mbs.example.com + mbs: + api_url: https://mbs.example.com/module-build-service/1/ + auth_method: oidc + oidc_id_provider: https://id.example.com/openidc/ + oidc_client_id: mbs-authorizer + oidc_client_secret: notsecret + oidc_scopes: + - openid + - https://id.example.com/scope/groups + - https://mbs.example.com/oidc/submit-build trigger: rpms: rawhide modules: rawhide-modular @@ -22,6 +30,7 @@ configuration: prefix: git://pkgs.example.com/ target: fluff-42.0.0-alpha-candidate scratch: false + platform: platform:fl42 git: author: DistroBaker email: noreply@example.com @@ -48,6 +57,9 @@ configuration: modules: source: "%(component)s.git#%(stream)s" destination: "%(component)s.git#%(stream)s-fluff-42.0.0-alpha" + rpms: + source: "%(component)s.git" + destination: "%(component)s.git#stream-%(name)s-%(stream)s" cache: source: "%(component)s" destination: "%(component)s" @@ -64,3 +76,8 @@ components: modules: testmodule:master: destination: testmodule#stream-master-fluff-42.0.0-alpha-experimental + rpms: + componentrpm: + source: componentsource.git#sourcebranch + destination: coomponentrpm.git#fluff-42.0.0-alpha-experimental + anotherrpm: {} diff --git a/tests/helpers.py b/tests/helpers.py index 2b6cabc..b83e1cc 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -57,6 +57,11 @@ def setup_test_repo(git_repo_dir, cfg_file=None): ["bash", "-c", "echo test > README"], ] if cfg_file: + if cfg_file.startswith(("---\n", "configuration:\n")): + tf = tempfile.NamedTemporaryFile(mode="w") + tf.write(cfg_file) + tf.flush() + cfg_file = tf.name cmds.extend( [ ["cp", cfg_file, "distrobaker.yaml"], diff --git a/tests/test_config.py b/tests/test_config.py index aee425f..c1641d9 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -33,12 +33,42 @@ def test_load_config(self): # try again specifying the branch cfg = distrobaker.load_config(td + "#main") - print("DEBUG loaded config = %s", cfg, file=sys.stderr) + print("DEBUG loaded config = %s" % cfg, file=sys.stderr) self.assertIs(type(cfg), dict) self.assertIsNotNone(cfg) # make sure what was loaded matches get_config() self.assertEqual(cfg, distrobaker.get_config()) + # verify MBS build platform + self.assertEqual(cfg["main"]["build"]["platform"], "platform:fl42") + + # verify MBS desination configuration + self.assertEqual( + cfg["main"]["destination"]["mbs"], + { + "api_url": "https://mbs.example.com/module-build-service/1/", + "auth_method": "oidc", + "oidc_client_id": "mbs-authorizer", + "oidc_client_secret": "notsecret", + "oidc_id_provider": "https://id.example.com/openidc/", + "oidc_scopes": [ + "openid", + "https://id.example.com/scope/groups", + "https://mbs.example.com/oidc/submit-build", + ], + }, + ) + # verify MBS source configuration is not present + self.assertTrue("mbs" not in cfg["main"]["source"]) + + # verify modular RPM component defaults were loaded + self.assertEqual( + cfg["main"]["defaults"]["modules"]["rpms"], + { + "source": "%(component)s.git", + "destination": "%(component)s.git#stream-%(name)s-%(stream)s", + }, + ) # verify some derived values are present in the configuration # with the expected values self.assertEqual( @@ -55,14 +85,29 @@ def test_load_config(self): "source": "testmodule.git#master", "destination": "testmodule#stream-master-fluff-42.0.0-alpha-experimental", "cache": {"source": "testmodule", "destination": "testmodule"}, + "rpms": { + "componentrpm": { + "source": "componentsource.git#sourcebranch", + "destination": "coomponentrpm.git#fluff-42.0.0-alpha-experimental", + }, + "anotherrpm": { + "source": "anotherrpm.git", + "destination": "anotherrpm.git#stream-testmodule-master", + }, + }, }, ) - # test for failure when loading config files that are missing required sections + # test for failure when loading troublesome config files # (this is just a randomly selected few of many possibilities) @parameterized.expand( [ # (testcase_name, config_file, expected_error) + ( + "missing configuration file", + "", + "does not contain distrobaker.yaml", + ), ( "no configuration", "distrobaker-no-configuration.yaml", @@ -78,9 +123,19 @@ def test_load_config(self): "distrobaker-no-source-profile.yaml", "source.profile missing", ), + ( + "missing destination.mbs", + "distrobaker-missing-dest-mbs.yaml", + "destination.mbs missing", + ), + ( + "missing destination.mbs", + "distrobaker-dest-mbs-not-mapping.yaml", + "destination.mbs must be a mapping", + ), ] ) - def test_load_config_missing_section( + def test_load_config_errors( self, testcase_name, config_file, expected_error ): with tempfile.TemporaryDirectory() as td: @@ -98,3 +153,34 @@ def test_load_config_missing_section( expected_error, cm.output ), ) + + # test for non-fatal warnings when loading config files with certain oddities + # (this is just a randomly selected few of many possibilities) + @parameterized.expand( + [ + # (testcase_name, config_file, expected_message) + ( + "extraneous source.mbs", + "distrobaker-extraneous-source-mbs.yaml", + "source.mbs is extraneous", + ), + ] + ) + def test_load_config_warnings( + self, testcase_name, config_file, expected_message + ): + with tempfile.TemporaryDirectory() as td: + helpers.setup_test_repo( + td, + os.path.join(helpers.DATA_DIR, "config", config_file), + ) + with self.assertLogs(distrobaker.logger) as cm: + cfg = distrobaker.load_config(td + "#main") + self.assertIsNotNone(cfg) + # make sure expected_message appears in logger output + self.assertTrue( + helpers.strings_with_substring(cm.output, expected_message), + msg="'{}' not found in logger output: {}".format( + expected_message, cm.output + ), + ) diff --git a/tests/test_process_comps.py b/tests/test_process_comps.py new file mode 100644 index 0000000..7113ed0 --- /dev/null +++ b/tests/test_process_comps.py @@ -0,0 +1,316 @@ +# SPDX-License-Identifier: MIT + +# WORK IN PROGRESS - NOT YET FUNCTIONAL! + +import distrobaker +import helpers +import logging +import mock +import os +import sys +import tempfile + + +try: + import unittest2 as unittest +except ImportError: + import unittest + + +def load_test_config(config_file): + with tempfile.TemporaryDirectory() as td: + helpers.setup_test_repo( + td, os.path.join(helpers.DATA_DIR, "config", config_file) + ) + cfg = distrobaker.load_config(td + "#main") + print("\nDEBUG loaded config = %s" % cfg, file=sys.stderr) + return cfg + + +class KojiSessionMock: + def __init__(self): + # placeholder for initialization + pass + + def listTagged(self, tag, latest=False): + print( + "\nDEBUG KojiSessionMock.listTagged called with tag %s." % tag, + file=sys.stderr, + ) + tagged_builds = { + "rawhide": [ + { + "id": 1, + "package_name": "foo", + "version": "rawhide", + "release": "1.1", + }, + { + "id": 2, + "package_name": "bar", + "version": "rawhide", + "release": "2.1", + }, + ], + "rawhide-modular": [ + { + "id": 3, + "package_name": "baz", + "version": "stable", + "release": "20210324.c0ffee43", + "nvr": "baz-stable-20210324.c0ffee43", + }, + { + "id": 4, + "package_name": "qux", + "version": "rolling", + "release": "20210324.deadbeef", + "nvr": "qux-rolling-20210324.deadbeef", + }, + ], + } + + return tagged_builds[tag] if tag in tagged_builds else [] + + def getBuild(self, nvr): + print( + "\nDEBUG KojiSessionMock.getBuild called with nvr %s." % nvr, + file=sys.stderr, + ) + + build_info = { + "baz-stable-20210324.c0ffee43": { + "source": "https://src.example.com/modules/baz.git?#00000000", + "extra": { + "typeinfo": { + "module": { + "name": "baz", + "stream": "stable", + "modulemd_str": "placeholder", + } + }, + }, + }, + "qux-rolling-20210324.deadbeef": { + "source": "https://src.example.com/modules/qux.git?#00000000", + "extra": { + "typeinfo": { + "module": { + "name": "qux", + "stream": "rolling", + "modulemd_str": "placeholder", + } + }, + }, + }, + } + + return build_info[nvr] if nvr in build_info else None + + +class TestProcessComponents(unittest.TestCase): + @classmethod + def setUpClass(cls): + # be sure to do no harm + distrobaker.dry_run = True + # load our distrobaker configuration + load_test_config("distrobaker-process_components.yaml") + + def setUp(self): + self.assertTrue(distrobaker.dry_run) + # make sure configuration was loaded + self.assertIsNotNone(distrobaker.get_config()) + + def test_not_a_set(self): + with self.assertLogs(distrobaker.logger, level=logging.DEBUG) as cm: + distrobaker.process_components(None) + expected_error = "must be passed a set" + self.assertTrue( + helpers.strings_with_substring(cm.output, expected_error), + msg="'{}' not found in logger output: {}".format( + expected_error, cm.output + ), + ) + + with self.assertLogs(distrobaker.logger, level=logging.DEBUG) as cm: + distrobaker.process_components(list()) + expected_error = "must be passed a set" + self.assertTrue( + helpers.strings_with_substring(cm.output, expected_error), + msg="'{}' not found in logger output: {}".format( + expected_error, cm.output + ), + ) + + with self.assertLogs(distrobaker.logger, level=logging.DEBUG) as cm: + distrobaker.process_components(dict()) + expected_error = "must be passed a set" + self.assertTrue( + helpers.strings_with_substring(cm.output, expected_error), + msg="'{}' not found in logger output: {}".format( + expected_error, cm.output + ), + ) + + @mock.patch("distrobaker.get_buildsys") + @mock.patch("distrobaker.build_comp") + @mock.patch("distrobaker.sync_repo") + def test_empty_set( + self, + mock_sync_repo, + mock_build_comp, + mock_get_buildsys, + ): + mock_get_buildsys.return_value = KojiSessionMock() + mock_sync_repo.return_value = ( + "https://src.example.com/dummy.git?#dummyref" + ) + + with self.assertLogs(distrobaker.logger, level=logging.DEBUG) as cm: + distrobaker.process_components(set()) + print( + "\nDEBUG log messages from call to process_components: %s" + % cm.output, + file=sys.stderr, + ) + expected_message = "Synchronized 4 component(s), 0 skipped." + self.assertTrue( + helpers.strings_with_substring(cm.output, expected_message), + msg="'{}' not found in logger output: {}".format( + expected_message, cm.output + ), + ) + + self.assertEqual(mock_sync_repo.call_count, 4) + mock_sync_repo.assert_has_calls( + [ + mock.call(comp="foo", ns="rpms", nvr=None), + mock.call(comp="bar", ns="rpms", nvr=None), + mock.call( + comp="baz:stable", + ns="modules", + nvr="baz-stable-20210324.c0ffee43", + ), + mock.call( + comp="qux:rolling", + ns="modules", + nvr="qux-rolling-20210324.deadbeef", + ), + ], + any_order=True, + ) + + self.assertEqual(mock_build_comp.call_count, 4) + mock_build_comp.assert_has_calls( + [ + mock.call(comp="foo", ref="dummyref", ns="rpms"), + mock.call(comp="bar", ref="dummyref", ns="rpms"), + mock.call(comp="baz:stable", ref="dummyref", ns="modules"), + mock.call(comp="qux:rolling", ref="dummyref", ns="modules"), + ], + any_order=True, + ) + + @mock.patch("distrobaker.get_buildsys") + @mock.patch("distrobaker.build_comp") + @mock.patch("distrobaker.sync_repo") + def test_specific_comps( + self, + mock_sync_repo, + mock_build_comp, + mock_get_buildsys, + ): + mock_get_buildsys.return_value = KojiSessionMock() + mock_sync_repo.return_value = ( + "https://src.example.com/dummy.git?#dummyref" + ) + + with self.assertLogs(distrobaker.logger, level=logging.DEBUG) as cm: + distrobaker.process_components({"rpms/bar", "modules/qux:rolling"}) + print( + "\nDEBUG log messages from call to process_components: %s" + % cm.output, + file=sys.stderr, + ) + expected_message = "Synchronized 2 component(s), 0 skipped." + self.assertTrue( + helpers.strings_with_substring(cm.output, expected_message), + msg="'{}' not found in logger output: {}".format( + expected_message, cm.output + ), + ) + + self.assertEqual(mock_sync_repo.call_count, 2) + mock_sync_repo.assert_has_calls( + [ + mock.call(comp="bar", ns="rpms", nvr=None), + mock.call( + comp="qux:rolling", + ns="modules", + nvr="qux-rolling-20210324.deadbeef", + ), + ], + any_order=True, + ) + + self.assertEqual(mock_build_comp.call_count, 2) + mock_build_comp.assert_has_calls( + [ + mock.call(comp="bar", ref="dummyref", ns="rpms"), + mock.call(comp="qux:rolling", ref="dummyref", ns="modules"), + ], + any_order=True, + ) + + @mock.patch("distrobaker.get_buildsys") + @mock.patch("distrobaker.build_comp") + @mock.patch("distrobaker.sync_repo") + def test_alternate_comps( + self, + mock_sync_repo, + mock_build_comp, + mock_get_buildsys, + ): + mock_get_buildsys.return_value = KojiSessionMock() + mock_sync_repo.return_value = ( + "https://src.example.com/dummy.git?#dummyref" + ) + + with self.assertLogs(distrobaker.logger, level=logging.DEBUG) as cm: + distrobaker.process_components( + {"rpms/fred", "modules/waldo:hidden"} + ) + print( + "\nDEBUG log messages from call to process_components: %s" + % cm.output, + file=sys.stderr, + ) + expected_message = "Synchronized 2 component(s), 0 skipped." + self.assertTrue( + helpers.strings_with_substring(cm.output, expected_message), + msg="'{}' not found in logger output: {}".format( + expected_message, cm.output + ), + ) + + self.assertEqual(mock_sync_repo.call_count, 2) + mock_sync_repo.assert_has_calls( + [ + mock.call(comp="fred", ns="rpms", nvr=None), + mock.call( + comp="waldo:hidden", + ns="modules", + nvr=None, + ), + ], + any_order=True, + ) + + self.assertEqual(mock_build_comp.call_count, 2) + mock_build_comp.assert_has_calls( + [ + mock.call(comp="fred", ref="dummyref", ns="rpms"), + mock.call(comp="waldo:hidden", ref="dummyref", ns="modules"), + ], + any_order=True, + ) diff --git a/tests/test_process_comps_unconfigured.py b/tests/test_process_comps_unconfigured.py new file mode 100644 index 0000000..d6ecd70 --- /dev/null +++ b/tests/test_process_comps_unconfigured.py @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: MIT + +import distrobaker +import helpers + +try: + import unittest2 as unittest +except ImportError: + import unittest + + +class TestProcessComponentsUnconfigured(unittest.TestCase): + def setUp(self): + # be sure to do no harm + distrobaker.dry_run = True + # reset global configuration in case it is set from running other tests + distrobaker.c = dict() + + def test_unconfigured_empty_set(self): + with self.assertLogs(distrobaker.logger) as cm: + distrobaker.process_components(set()) + # make sure expected error appears in logger output + expected_error = "DistroBaker is not configured, aborting" + self.assertTrue( + helpers.strings_with_substring(cm.output, expected_error), + msg="'{}' not found in logger output: {}".format( + expected_error, cm.output + ), + ) From 871dcca29730adf6219d7e72cfa59b112bb1bddd Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Mon, 10 May 2021 10:38:46 -0500 Subject: [PATCH 03/10] Use Exception instead of ImportError to catch failed imports Signed-off-by: Merlin Mathesius --- lib/distrobaker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/distrobaker.py b/lib/distrobaker.py index a37d6f0..4df6aa0 100644 --- a/lib/distrobaker.py +++ b/lib/distrobaker.py @@ -282,7 +282,7 @@ def load_config(crepo): # feedback if it isn't installed try: import openidc_client # noqa: F401 - except ImportError: + except Exception: logger.exception( "python-openidc-client needs to be " "installed for %s.mbs.%s %s", @@ -302,7 +302,7 @@ def load_config(crepo): # feedback if it isn't installed try: import requests_kerberos # noqa: F401 - except ImportError: + except Exception: logger.exception( "python-requests-kerberos needs to be " "installed for %s.mbs.%s %s", From 13c632e493036b99b832d7cc4cc36e118e4be905 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Mon, 10 May 2021 10:49:48 -0500 Subject: [PATCH 04/10] Eliminate unnecessary parameters to clone_destination_repo() and fetch_upstream_repo() Signed-off-by: Merlin Mathesius --- lib/distrobaker.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/distrobaker.py b/lib/distrobaker.py index 4df6aa0..a731fd9 100644 --- a/lib/distrobaker.py +++ b/lib/distrobaker.py @@ -560,24 +560,22 @@ def load_config(crepo): return c -def clone_destination_repo(ns, comp, cdst, dscm, dirname): +def clone_destination_repo(ns, comp, dscm, dirname): """Clone the component destination SCM repository to the given directory path. Git remote name 'origin' will be used. :param ns: The component namespace :param comp: The component name - :param cdst: The destination repository for the component :param dscm: The destination SCM :param dirname: Path to which the requested repository should be cloned :returns: repo, or None on error """ logger.debug( - "Cloning %s/%s from %s/%s/%s", + "Cloning %s/%s from %s#%s", ns, comp, - c["main"]["destination"]["scm"], - ns, - cdst, + dscm["link"], + dscm["ref"], ) for attempt in range(retry): try: @@ -601,13 +599,12 @@ def clone_destination_repo(ns, comp, cdst, dscm, dirname): return repo -def fetch_upstream_repo(ns, comp, csrc, sscm, repo): +def fetch_upstream_repo(ns, comp, sscm, repo): """Fetch the component source SCM repository to the given git repo. Git remote name 'source' will be used. :param ns: The component namespace :param comp: The component name - :param csrc: The source repository for the component :param sscm: The source SCM :param repo: git Repo instance to which the repository should be fetched :returns: repo, or None on error @@ -1191,14 +1188,14 @@ def sync_repo( pushrepo = True logger.debug("Using git repository directory: %s", gitdir) - repo = clone_destination_repo(ns, comp, cdst, dscm, gitdir) + repo = clone_destination_repo(ns, comp, dscm, gitdir) if repo is None: logger.error( "Failed to clone destination repo for %s/%s, skipping.", ns, comp ) return None - if fetch_upstream_repo(ns, comp, csrc, sscm, repo) is None: + if fetch_upstream_repo(ns, comp, sscm, repo) is None: logger.error( "Failed to fetch upstream repo for %s/%s, skipping.", ns, comp ) From 2572af7e7dfef92ed78995685c97422fe733b55b Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Mon, 10 May 2021 10:50:00 -0500 Subject: [PATCH 05/10] Pre-configure logging when running tests Signed-off-by: Merlin Mathesius --- pyproject.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index a8f43fe..1282534 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,8 @@ [tool.black] line-length = 79 + +[tool.pytest.ini_options] +# to see log output when running tests, set log_cli = true +log_cli = false +log_cli_level = "DEBUG" +log_cli_format = "%(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)" From 02a94dd237827592de332293aac86455344df8b0 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Mon, 7 Jun 2021 11:41:49 -0500 Subject: [PATCH 06/10] Update to obey control.build configuration option Signed-off-by: Merlin Mathesius --- lib/distrobaker.py | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/lib/distrobaker.py b/lib/distrobaker.py index a731fd9..2c5a459 100644 --- a/lib/distrobaker.py +++ b/lib/distrobaker.py @@ -1445,6 +1445,9 @@ def build_comp(comp, ref, ns="rpms"): "The component %s/%s is excluded from sync, aborting.", ns, comp ) return None + if not c["main"]["control"]["build"]: + logger.critical("Builds are disabled, aborting.") + return None logger.info("Processing build for %s/%s.", ns, comp) if not dry_run: bsys = get_buildsys("destination") @@ -1686,18 +1689,25 @@ def process_message(msg): return None scmurl = sync_repo(comp, ns=ns, nvr=nvr) if scmurl is not None: - scm = split_scmurl(scmurl) - task = build_comp(comp, scm["ref"], ns=ns) - if task is not None: - logger.info( - "Build submission of %s/%s complete, task %s, trigger processed.", - ns, - comp, - task, - ) + if c["main"]["control"]["build"]: + scm = split_scmurl(scmurl) + task = build_comp(comp, scm["ref"], ns=ns) + if task is not None: + logger.info( + "Build submission of %s/%s complete, task %s, trigger processed.", + ns, + comp, + task, + ) + else: + logger.error( + "Build submission of %s/%s failed, aborting trigger.", + ns, + comp, + ) else: - logger.error( - "Build submission of %s/%s failed, aborting trigger.", + logger.info( + "Builds are disabled, no build attempted for %s/%s, trigger processed.", ns, comp, ) From febf45d092d602ad4830fe2359a344b3cf544354 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 8 Jun 2021 11:22:18 -0500 Subject: [PATCH 07/10] Add unit tests for repo manipulation functions Signed-off-by: Merlin Mathesius --- tests/test_repos.py | 371 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 371 insertions(+) create mode 100644 tests/test_repos.py diff --git a/tests/test_repos.py b/tests/test_repos.py new file mode 100644 index 0000000..cc8745e --- /dev/null +++ b/tests/test_repos.py @@ -0,0 +1,371 @@ +# SPDX-License-Identifier: MIT + +import distrobaker +import helpers +import logging +import os +import subprocess +import tempfile + +from parameterized import parameterized + + +try: + import unittest2 as unittest +except ImportError: + import unittest + + +def _run_cmds(cmds): + cwd = None + for cmd in cmds: + if cmd[0] == "cd": + cwd = cmd[1] + proc = subprocess.Popen( + cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) + out, err = proc.communicate() + + +def _setup_repo(dirname, marker=None, base=None): + clone_dirobj = tempfile.TemporaryDirectory() + clone_dir = clone_dirobj.name + + # setup a simple bare repo, optionally containing a README and a marker file + if base: + cmds = ( + ["cd", "/tmp"], + ["git", "clone", "--bare", base, dirname], + ) + _run_cmds(cmds) + else: + cmds = ( + ["cd", "/tmp"], + ["git", "init", "--bare", dirname], + ["rm", "-rf", clone_dir], + ["git", "clone", dirname, clone_dir], + ["cd", clone_dir], + ["git", "config", "user.name", "John Doe"], + ["git", "config", "user.email", "jdoe@example.com"], + ["git", "add", "."], + ["git", "commit", "--allow-empty", "-m", "Initial commit"], + ["git", "push"], + ) + _run_cmds(cmds) + + if marker: + cmds = ( + ["cd", "/tmp"], + ["rm", "-rf", clone_dir], + ["git", "clone", dirname, clone_dir], + ["cd", clone_dir], + ["git", "config", "user.name", "John Doe"], + ["git", "config", "user.email", "jdoe@example.com"], + ["git", "rm", "-rf", "--ignore-unmatch", "."], + ["bash", "-c", "echo %s > README" % marker], + ["touch", marker], + ["git", "add", "."], + ["git", "commit", "-m", "Marker commit"], + ["git", "push"], + ) + _run_cmds(cmds) + + +def _repo_log(repodir, branch="HEAD"): + cmd = ["git", "log", "--pretty=oneline", "--no-decorate", branch] + proc = subprocess.Popen( + cmd, cwd=repodir, stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) + out, err = proc.communicate() + return out.decode("utf-8") + + +def _repo_get_current_branch(repodir): + cmd = ["git", "branch", "--show-current"] + proc = subprocess.Popen( + cmd, cwd=repodir, stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) + out, err = proc.communicate() + return out.decode("utf-8").rstrip() + + +def _repo_checkout_branch(repodir, branch): + cmds = ( + ["cd", repodir], + ["git", "checkout", branch], + ) + _run_cmds(cmds) + + +def _repo_get_config_option(repodir, opt_name): + cmd = ["git", "config", "--local", opt_name] + proc = subprocess.Popen( + cmd, cwd=repodir, stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) + out, err = proc.communicate() + return out.decode("utf-8").rstrip() + + +class TestRepos(unittest.TestCase): + def _setUp(self, common_history=False): + # be sure to do no harm + distrobaker.dry_run = True + + # create and setup a set of temporary git repos + self.scm_repotree_dirobj = tempfile.TemporaryDirectory() + distrobaker.logger.debug( + "scm repotree dir = %s" % self.scm_repotree_dirobj.name + ) + + dst_repo = os.path.join( + self.scm_repotree_dirobj.name, "destination", "rpms", "foo.git" + ) + src_repo = os.path.join( + self.scm_repotree_dirobj.name, "source", "rpms", "foo.git" + ) + _setup_repo( + dst_repo, + base=None, + marker="destination", + ) + if common_history: + baserepo = dst_repo + else: + baserepo = None + _setup_repo( + src_repo, + base=baserepo, + marker="source", + ) + + # do a brute force set up of a minimal configuration + distrobaker.c = { + "main": { + "destination": { + "scm": os.path.join( + self.scm_repotree_dirobj.name, "destination" + ), + }, + "source": { + "scm": os.path.join( + self.scm_repotree_dirobj.name, "source" + ), + }, + "git": { + "author": "Tux Penguin", + "email": "tux@example.com", + "message": "Commit message", + }, + }, + } + + self.ns = "rpms" + self.comp = "foo" + cbld = "%(component)s.git" % {"component": self.comp} + csrc = "%(component)s.git" % {"component": self.comp} + cdst = "%(component)s.git" % {"component": self.comp} + self.bscm = distrobaker.split_scmurl( + "{}/{}/{}".format("https://dummy.scm", self.ns, cbld) + ) + self.bscm["ref"] = self.bscm["ref"] if self.bscm["ref"] else "master" + self.sscm = distrobaker.split_scmurl( + "{}/{}/{}".format( + distrobaker.c["main"]["source"]["scm"], self.ns, csrc + ) + ) + self.dscm = distrobaker.split_scmurl( + "{}/{}/{}".format( + distrobaker.c["main"]["destination"]["scm"], self.ns, cdst + ) + ) + self.dscm["ref"] = self.dscm["ref"] if self.dscm["ref"] else "master" + + def tearDown(self): + self.scm_repotree_dirobj.cleanup() + + def test_repo_setup(self): + self._setUp() + + with tempfile.TemporaryDirectory() as tmpdir: + repo = distrobaker.clone_destination_repo( + self.ns, self.comp, self.dscm, tmpdir + ) + self.assertIsNotNone(repo) + self.assertEqual(tmpdir, repo.working_dir) + # make sure the expected files are present in the clone + self.assertCountEqual( + os.listdir(tmpdir), [".git", "README", "destination"] + ) + readme = open(os.path.join(tmpdir, "README")).read().rstrip() + self.assertEqual(readme, "destination") + # make sure the git log of the clone is identical to the original + self.assertEqual( + _repo_log(self.dscm["link"], self.dscm["ref"]), + _repo_log(tmpdir), + ) + dest_cur_branch = _repo_get_current_branch(tmpdir) + + self.assertIsNotNone( + distrobaker.fetch_upstream_repo( + self.ns, self.comp, self.sscm, repo + ) + ) + _repo_checkout_branch(tmpdir, "source/master") + # make sure the expected files are present in the repo + self.assertCountEqual( + os.listdir(tmpdir), [".git", "README", "source"] + ) + readme = open(os.path.join(tmpdir, "README")).read().rstrip() + self.assertEqual(readme, "source") + # make sure the git log of the repo is identical to the original + self.assertEqual( + _repo_log(self.sscm["link"], "master"), _repo_log(tmpdir) + ) + + _repo_checkout_branch(tmpdir, dest_cur_branch) + + # check repo option values are currently unset + self.assertEqual( + _repo_get_config_option(tmpdir, "user.name"), + "", + ) + self.assertEqual( + _repo_get_config_option(tmpdir, "user.email"), + "", + ) + + # configure repo and check option values are set correctly + self.assertIsNotNone( + distrobaker.configure_repo(self.ns, self.comp, repo) + ) + self.assertEqual( + _repo_get_config_option(tmpdir, "user.name"), + "Tux Penguin", + ) + self.assertEqual( + _repo_get_config_option(tmpdir, "user.email"), + "tux@example.com", + ) + + @parameterized.expand( + [ + # (testcase_name, common_history) + ("common", True), + ("unrelated", False), + ] + ) + def test_repo_merge(self, testcase_name, common_history): + self._setUp(common_history) + + with tempfile.TemporaryDirectory() as tmpdir: + # prep repo for merge; testing of these methods is done by test_repo_setup() + repo = distrobaker.clone_destination_repo( + self.ns, self.comp, self.dscm, tmpdir + ) + distrobaker.fetch_upstream_repo( + self.ns, self.comp, self.sscm, repo + ) + distrobaker.configure_repo(self.ns, self.comp, repo) + + self.assertIsNotNone( + distrobaker.sync_repo_merge( + self.ns, self.comp, repo, self.bscm, self.sscm, self.dscm + ) + ) + + # make sure the expected files are present in the repo + self.assertCountEqual( + os.listdir(tmpdir), [".git", "README", "source"] + ) + readme = open(os.path.join(tmpdir, "README")).read().rstrip() + self.assertEqual(readme, "source") + + def test_repo_pull_common(self): + self._setUp(common_history=True) + + with tempfile.TemporaryDirectory() as tmpdir: + # prep repo for merge; testing of these methods is done by test_repo_setup() + repo = distrobaker.clone_destination_repo( + self.ns, self.comp, self.dscm, tmpdir + ) + distrobaker.fetch_upstream_repo( + self.ns, self.comp, self.sscm, repo + ) + distrobaker.configure_repo(self.ns, self.comp, repo) + + self.assertIsNotNone( + distrobaker.sync_repo_pull( + self.ns, + self.comp, + repo, + self.bscm, + ) + ) + + def test_repo_pull_unrelated(self): + self._setUp(common_history=False) + + with tempfile.TemporaryDirectory() as tmpdir: + # prep repo for merge; testing of these methods is done by test_repo_setup() + repo = distrobaker.clone_destination_repo( + self.ns, self.comp, self.dscm, tmpdir + ) + distrobaker.fetch_upstream_repo( + self.ns, self.comp, self.sscm, repo + ) + distrobaker.configure_repo(self.ns, self.comp, repo) + + # pull should fail due to repos having unrelated histories + with self.assertLogs( + distrobaker.logger, level=logging.DEBUG + ) as cm: + distrobaker.sync_repo_pull( + self.ns, + self.comp, + repo, + self.bscm, + ) + expected_error = "Not possible to fast-forward" + self.assertTrue( + helpers.strings_with_substring(cm.output, expected_error), + msg="'{}' not found in logger output: {}".format( + expected_error, cm.output + ), + ) + + def test_repo_push(self): + self._setUp(common_history=False) + + with tempfile.TemporaryDirectory() as tmpdir: + # prep repo for merge; testing of these methods is done by test_repo_setup() + repo = distrobaker.clone_destination_repo( + self.ns, self.comp, self.dscm, tmpdir + ) + distrobaker.fetch_upstream_repo( + self.ns, self.comp, self.sscm, repo + ) + distrobaker.configure_repo(self.ns, self.comp, repo) + + distrobaker.sync_repo_merge( + self.ns, self.comp, repo, self.bscm, self.sscm, self.dscm + ) + + # make sure the git log of the destination is not yet the same as the merged directory + self.assertNotEqual( + _repo_log(tmpdir), + _repo_log(self.dscm["link"], self.dscm["ref"]), + ) + + # we have to temporarily disable dry-run mode or the push never happens + distrobaker.dry_run = False + self.assertIsNotNone( + distrobaker.repo_push(self.ns, self.comp, repo, self.dscm) + ) + # back to doing no harm + distrobaker.dry_run = True + + # make sure the git log of the destination is now the same as the merged directory + self.assertEqual( + _repo_log(tmpdir), + _repo_log(self.dscm["link"], self.dscm["ref"]), + ) From c0835c40a994ab7b23e7819a33a063899145ded6 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Thu, 10 Jun 2021 14:10:26 -0500 Subject: [PATCH 08/10] Correct race condition in unit test for repo manipulation Signed-off-by: Merlin Mathesius --- tests/test_repos.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/test_repos.py b/tests/test_repos.py index cc8745e..64c4753 100644 --- a/tests/test_repos.py +++ b/tests/test_repos.py @@ -6,6 +6,7 @@ import os import subprocess import tempfile +import time from parameterized import parameterized @@ -132,6 +133,11 @@ def _setUp(self, common_history=False): baserepo = dst_repo else: baserepo = None + # Delay a second to avoid a race condition that can result in + # both repos ending up with the same initial commit hash which + # can cause unexpected results by making them appear to have + # common history! + time.sleep(1) _setup_repo( src_repo, base=baserepo, @@ -325,7 +331,7 @@ def test_repo_pull_unrelated(self): repo, self.bscm, ) - expected_error = "Not possible to fast-forward" + expected_error = "refusing to merge unrelated histories" self.assertTrue( helpers.strings_with_substring(cm.output, expected_error), msg="'{}' not found in logger output: {}".format( From 07ad20d56b14df2ccc00e0114939d4f3f2d83289 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Thu, 10 Jun 2021 14:16:26 -0500 Subject: [PATCH 09/10] Correct scmurl used when submitting module builds Signed-off-by: Merlin Mathesius --- lib/distrobaker.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/distrobaker.py b/lib/distrobaker.py index 2c5a459..4b47bf1 100644 --- a/lib/distrobaker.py +++ b/lib/distrobaker.py @@ -1454,10 +1454,10 @@ def build_comp(comp, ref, ns="rpms"): buildcomp = comp if comp in c["comps"][ns]: buildcomp = split_scmurl(c["comps"][ns][comp]["destination"])["comp"] - buildscmurl = "{}/{}/{}#{}".format( - c["main"]["build"]["prefix"], ns, buildcomp, ref - ) if ns == "rpms": + buildscmurl = "{}/{}/{}#{}".format( + c["main"]["build"]["prefix"], ns, buildcomp, ref + ) try: if not dry_run: task = bsys.build( @@ -1490,7 +1490,10 @@ def build_comp(comp, ref, ns="rpms"): ) return None elif ns == "modules": - ms = split_module(comp) + ms = split_module(buildcomp) + buildscmurl = "{}/{}/{}#{}".format( + c["main"]["build"]["prefix"], ns, ms["name"], ref + ) ps = split_module(c["main"]["build"]["platform"]) body = { "scmurl": buildscmurl, From d9c05cafd6179d5a275378ebb036a70c6b91f941 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Wed, 14 Jul 2021 15:08:08 -0500 Subject: [PATCH 10/10] Add logic to skip MBS generated *-devel modules Correct unmangled component name in debug message Signed-off-by: Merlin Mathesius --- lib/distrobaker.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/distrobaker.py b/lib/distrobaker.py index 4b47bf1..0adc931 100644 --- a/lib/distrobaker.py +++ b/lib/distrobaker.py @@ -1674,9 +1674,21 @@ def process_message(msg): if comp != bcomp: logger.debug( "Using unmangled component name: %s", - comp, + bcomp, ) comp = bcomp + # get SCM component name, stripped of any .git and ? suffixes + scm_comp = regex.sub( + r"(\.git)?\??$", "", split_scmurl(binfo["scmurl"])["comp"] + ) + # skip generated *-devel modules + if binfo["name"] != scm_comp: + logger.info( + "Module name %s does not match SCM component name %s, skipping.", + binfo["name"], + scm_comp, + ) + return None else: logger.debug("Message tag not configured as a trigger, ignoring.") return None