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 9120E1382C5 for ; Tue, 13 Apr 2021 19:03:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC927E0958; Tue, 13 Apr 2021 19:03:52 +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 9EAD7E0958 for ; Tue, 13 Apr 2021 19:03:52 +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 50583340DB2 for ; Tue, 13 Apr 2021 19:03:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62FFE646 for ; Tue, 13 Apr 2021 19:03:49 +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: <1618340584.482017e7c399b4e97502617f0aa70ff50df54b7b.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/portage.py X-VCS-Directories: buildbot_gentoo_ci/steps/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 482017e7c399b4e97502617f0aa70ff50df54b7b X-VCS-Branch: master Date: Tue, 13 Apr 2021 19:03:49 +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: a23c4f8e-2c71-45bc-9a0c-b89ff17a6498 X-Archives-Hash: 5ba9fc420c0c2eb6b72a446cb1695ff0 commit: 482017e7c399b4e97502617f0aa70ff50df54b7b Author: Magnus Granberg gentoo org> AuthorDate: Tue Apr 13 19:03:04 2021 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Tue Apr 13 19:03:04 2021 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=482017e7 check repository_linkname symalink in LocalWorkers Signed-off-by: Magnus Granberg gentoo.org> buildbot_gentoo_ci/steps/portage.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/buildbot_gentoo_ci/steps/portage.py b/buildbot_gentoo_ci/steps/portage.py index c1a4d90..c7e82ce 100644 --- a/buildbot_gentoo_ci/steps/portage.py +++ b/buildbot_gentoo_ci/steps/portage.py @@ -18,6 +18,7 @@ from twisted.python import log from buildbot.process.buildstep import BuildStep from buildbot.process.results import SUCCESS from buildbot.process.results import FAILURE +from buildbot.process.results import SKIPPED from buildbot.plugins import steps from buildbot_gentoo_ci.steps import master as master_steps @@ -367,6 +368,9 @@ class CheckPathLocal(BuildStep): @defer.inlineCallbacks def run(self): + self.gentooci = self.master.namedServices['services'].namedServices['gentooci'] + self.repository_linkname = self.gentooci.config.project['repository_basedir'] + self.repository_basedir2 = '/home/repos2/' self.portage_path = yield os.path.join('etc', 'portage') self.profile_path = yield os.path.join(self.portage_path, 'make.profile') self.repos_path = yield os.path.join(self.portage_path, 'repos.conf') @@ -381,6 +385,8 @@ class CheckPathLocal(BuildStep): ]: if not os.path.isdir(x): os.makedirs(x) + if not os.path.islink(self.repository_linkname): + os.symlink(self.repository_basedir2, self.repository_linkname) return SUCCESS class SetMakeProfileLocal(BuildStep): @@ -399,7 +405,7 @@ class SetMakeProfileLocal(BuildStep): def run(self): parent_path = yield os.path.join('etc','portage', 'make.profile', 'parent') if os.path.isfile(parent_path): - return SUCCESS + return SKIPPED self.gentooci = self.master.namedServices['services'].namedServices['gentooci'] self.repository_basedir = self.gentooci.config.project['repository_basedir'] makeprofiles_paths = []