From eb6942a4a5406e31da749179748a3f67880be82e Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: May 04 2017 09:19:45 +0000 Subject: When signing base module, query PDC also for non-active modules. Signed-off-by: Jan Kaluza --- diff --git a/robosignatory/tagconsumer.py b/robosignatory/tagconsumer.py index 97e3598..f9d5835 100644 --- a/robosignatory/tagconsumer.py +++ b/robosignatory/tagconsumer.py @@ -33,7 +33,8 @@ class TagSignerConsumer(fedmsg.consumers.FedmsgConsumer): tuple(self.config['robosignatory.base_module_names']) self.pdc_client = PDCClient( - server=self.config['robosignatory.pdc_url'], develop=True) + server=self.config['robosignatory.pdc_url'], develop=True, + ssl_verify=True) signing_config = self.config['robosignatory.signing'] self.signer = utils.get_signing_helper(**signing_config) @@ -116,14 +117,15 @@ class TagSignerConsumer(fedmsg.consumers.FedmsgConsumer): self.sign_modular_rpms(build_nvr, build_id, tag, koji_instance) - def verify_base_module_tag(self, tag): + def verify_base_module_tag(self, tag, active=True): """ Verifies that the base module tag is valid. Sets the tag['stream'] and tag['verified']. """ query = {} query["koji_tag"] = tag["name"] - query["active"] = True + if active is not None: + query["active"] = active retval = self.pdc_client.unreleasedvariants(page_size=-1, **query) if not retval or len(retval) != 1: @@ -234,14 +236,16 @@ class TagSignerConsumer(fedmsg.consumers.FedmsgConsumer): return # Try to find out if the current tag is a base module before traversing - # the tag inheritance tree. + # the tag inheritance tree. The builds are tagged to module tag before + # it is marked as complete, therefore we do not want to check whether + # the base module is active. maybe_tag = { "id": info["id"], "name": info['name'], "verified": False, "stream": None, } - maybe_tag = self.verify_base_module_tag(maybe_tag) + maybe_tag = self.verify_base_module_tag(maybe_tag, active=None) if maybe_tag["verified"]: base_module_tag = maybe_tag else: