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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3570A158094 for ; Sun, 25 Sep 2022 11:46:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 427C5E0D07; Sun, 25 Sep 2022 11:46:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29893E0D07 for ; Sun, 25 Sep 2022 11:46:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D8DCB340DAF for ; Sun, 25 Sep 2022 11:46:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 351B65BF for ; Sun, 25 Sep 2022 11:46:23 +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: <1664106122.1a48ccb70732fa8367c36c842861c080c03eb1a2.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/builders.py buildbot_gentoo_ci/steps/portage.py X-VCS-Directories: buildbot_gentoo_ci/steps/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 1a48ccb70732fa8367c36c842861c080c03eb1a2 X-VCS-Branch: master Date: Sun, 25 Sep 2022 11:46:23 +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: cabb81d7-129e-4e02-8b1c-85aabe03317d X-Archives-Hash: d2c74e161cbaff3983c6eb71d43017de commit: 1a48ccb70732fa8367c36c842861c080c03eb1a2 Author: Magnus Granberg gentoo org> AuthorDate: Sun Sep 25 11:42:02 2022 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Sun Sep 25 11:42:02 2022 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=1a48ccb7 Add support for test on merge_request Signed-off-by: Magnus Granberg gentoo.org> buildbot_gentoo_ci/steps/builders.py | 10 ++++++++++ buildbot_gentoo_ci/steps/portage.py | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py index 3b6a8d0..00980e3 100644 --- a/buildbot_gentoo_ci/steps/builders.py +++ b/buildbot_gentoo_ci/steps/builders.py @@ -1296,6 +1296,16 @@ class SetupStepts(BuildStep): if build: yield log.addStdout('Runing Build: YES\n') aftersteps_list.append(RunBuild()) + # run tests + test = False + if self.getProperty('projectrepository_data')['test']: + test = True + if self.getProperty('projectrepository_data')['test_mr'] and self.getProperty("event") == 'merge_request': + test = True + if test: + yield log.addStdout('Runing Test: YES\n') + else: + yield log.addStdout('Runing Test: NO\n') # run eclean pkg and dist #if build: #f.addStep(builders.RunEclean(step='pkg') diff --git a/buildbot_gentoo_ci/steps/portage.py b/buildbot_gentoo_ci/steps/portage.py index ff06c58..6d838d7 100644 --- a/buildbot_gentoo_ci/steps/portage.py +++ b/buildbot_gentoo_ci/steps/portage.py @@ -295,7 +295,12 @@ class SetPackageDefault(BuildStep): yield log.addStdout(line + separator1) # for test we need to add env and use #FIXME: check restrictions, test use mask and required use + test = False if self.getProperty('projectrepository_data')['test']: + test = True + if self.getProperty('projectrepository_data')['test_mr'] and self.getProperty("event") == 'merge_request': + test = True + if test: auxdb_iuses = yield self.gentooci.db.versions.getMetadataByUuidAndMatadata(self.getProperty("version_data")['uuid'], 'iuse') for auxdb_iuse in auxdb_iuses: iuse, status = getIUseValue(auxdb_iuse['value'])