From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F37C71382C5 for ; Mon, 29 Mar 2021 00:34:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36AB1E0825; Mon, 29 Mar 2021 00:34:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11A45E0825 for ; Mon, 29 Mar 2021 00:34:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C684A340E80 for ; Mon, 29 Mar 2021 00:34:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 20331635 for ; Mon, 29 Mar 2021 00:34:28 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1616977987.e01a8423d8cc9371320ea0016107d13c3a7dd991.zorry@gentoo> Subject: [gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/steps/ X-VCS-Repository: proj/tinderbox-cluster X-VCS-Files: buildbot_gentoo_ci/steps/update_db.py X-VCS-Directories: buildbot_gentoo_ci/steps/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: e01a8423d8cc9371320ea0016107d13c3a7dd991 X-VCS-Branch: master Date: Mon, 29 Mar 2021 00:34:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: db976305-ba19-4646-98e6-bc3c17c6e753 X-Archives-Hash: 20e52eaafe420d4d8952b28c33b7caa8 commit: e01a8423d8cc9371320ea0016107d13c3a7dd991 Author: Magnus Granberg gentoo org> AuthorDate: Mon Mar 29 00:33:07 2021 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Mon Mar 29 00:33:07 2021 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=e01a8423 Change code in TriggerCheckForCPV for trigging Signed-off-by: Magnus Granberg gentoo.org> buildbot_gentoo_ci/steps/update_db.py | 50 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/buildbot_gentoo_ci/steps/update_db.py b/buildbot_gentoo_ci/steps/update_db.py index d35a967..b84e256 100644 --- a/buildbot_gentoo_ci/steps/update_db.py +++ b/buildbot_gentoo_ci/steps/update_db.py @@ -181,40 +181,40 @@ class TriggerCheckForCPV(BuildStep): # check if git_change is a string or a list if not isinstance(self.git_changes, list): return FAILURE - self.success = True addStepUpdateCPVData = [] for change_data in self.git_changes: # make a trigger for all cpv in the list for cpv in change_data['cpvs']: + self.success = True + if change_data['repository'] != self.getProperty("repository_data")['name']: + log.msg("%s don't match" % change_data['repository']) + self.success = False + # Trigger cpv builds and update db if we are working with ebuilds # check that cpv is valied if catpkgsplit(cpv) is None: log.msg("%s is not vaild package name" % cpv) self.success = False - else: - if change_data['repository'] != self.getProperty("repository_data")['name']: - log.msg("%s don't match" % change_data['repository']) - self.success = False - else: - revision_data = {} - revision_data['author'] = change_data['author'] - revision_data['committer'] = change_data['committer'] - revision_data['comments'] = change_data['comments'] - revision_data['revision'] = change_data['revision'] - # call update_cpv_data - addStepUpdateCPVData.append( - steps.Trigger( - schedulerNames=['update_cpv_data'], - waitForFinish=False, - updateSourceStamp=False, - set_properties={ - 'cpv' : cpv, - 'project_data' : self.getProperty("project_data"), - 'repository_data' : self.getProperty("repository_data"), - 'revision_data' : revision_data, - } - ) + if self.success: + revision_data = {} + revision_data['author'] = change_data['author'] + revision_data['committer'] = change_data['committer'] + revision_data['comments'] = change_data['comments'] + revision_data['revision'] = change_data['revision'] + addStepUpdateCPVData.append( + steps.Trigger( + schedulerNames=['update_cpv_data'], + waitForFinish=False, + updateSourceStamp=False, + set_properties={ + 'cpv' : cpv, + 'project_data' : self.getProperty("project_data"), + 'repository_data' : self.getProperty("repository_data"), + 'revision_data' : revision_data, + } ) - yield self.build.addStepsAfterCurrentStep(addStepUpdateCPVData) + ) + print(addStepUpdateCPVData) + yield self.build.addStepsAfterCurrentStep(addStepUpdateCPVData) if self.success is False: return FAILURE return SUCCESS