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 B58B615815E for ; Mon, 5 Feb 2024 18:54:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1AD2E2A55; Mon, 5 Feb 2024 18:54:37 +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 BC225E2A55 for ; Mon, 5 Feb 2024 18:54:37 +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 957023430A6 for ; Mon, 5 Feb 2024 18:54:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE255358 for ; Mon, 5 Feb 2024 18:54:34 +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: <1707159260.7f25300ddcf94e1d5018e9bc343a22155e3b043c.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/nodes.py X-VCS-Directories: buildbot_gentoo_ci/steps/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 7f25300ddcf94e1d5018e9bc343a22155e3b043c X-VCS-Branch: master Date: Mon, 5 Feb 2024 18:54:34 +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: 7f224ef1-5e75-4d53-bece-25b7e20fb6e6 X-Archives-Hash: 3981b296d10bede3c9e3841a6579ec72 commit: 7f25300ddcf94e1d5018e9bc343a22155e3b043c Author: Magnus Granberg gentoo org> AuthorDate: Mon Feb 5 18:54:20 2024 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Mon Feb 5 18:54:20 2024 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=7f25300d Use settings repository for dockerfiles Signed-off-by: Magnus Granberg gentoo.org> buildbot_gentoo_ci/steps/nodes.py | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/buildbot_gentoo_ci/steps/nodes.py b/buildbot_gentoo_ci/steps/nodes.py index 7a01cbb..c1928ba 100644 --- a/buildbot_gentoo_ci/steps/nodes.py +++ b/buildbot_gentoo_ci/steps/nodes.py @@ -77,30 +77,26 @@ class SetupBuildStepsForDocker(BuildStep): self.gentooci = self.master.namedServices['services'].namedServices['gentooci'] node_data = self.getProperty("node_data") image_data = self.getProperty("image_data") - dockerfile = self.getProperty("image_data")['dockerfile'] + '.Dockerfile' + dockerfile = os.path.join('Project', self.getProperty("project_data")['uuid'],'docker', image_data['dockerfile'] + '.Dockerfile') + repository_data = yield self.gentooci.db.repositorys.getRepositoryByUuid(self.getProperty("project_data")['settings_repository_uuid']) dockerfile_path = os.path.join(self.master.basedir, 'docker') #FIXME: Set build timeout in config self.build_timeout = 6600 aftersteps_list = [] - aftersteps_list.append(steps.FileDownload( - flunkOnFailure=True, - name='Upload Dockerfile', - mastersrc = os.path.join(dockerfile_path, dockerfile), - workerdest = dockerfile - )) + aftersteps_list.append(steps.GitLab(repourl=repository_data['url'], + name = 'RunGit', + descriptionDone=repository_data['name'], + mode=repository_data['mode'], + method=repository_data['method'], + submodules=True, + alwaysUseLatest=repository_data['alwaysuselatest'] + )) # build the gentoo docker buildbot-worker image # set the build args self.buildargs = {} - # set PROJECTUUID - self.buildargs['PROJECTUUID'] = self.getProperty("project_uuid") - # set ACCEPT_KEYWORDS - keyword_data = yield self.gentooci.db.keywords.getKeywordById(self.getProperty('project_data')['keyword_id']) - if self.getProperty('project_data')['status'] == 'unstable': - self.buildargs['KEYWORDS'] = '~' + keyword_data['name'] - else: - self.buildargs['KEYWORDS'] = keyword_data['name'] - # set ARCH - self.buildargs['ARCH'] = keyword_data['name'] + # set PROJECTUUID and PROJECTNAME + self.buildargs['PROJECTUUID'] = self.getProperty("project_data")['uuid'] + self.buildargs['PROJECTNAME'] = self.getProperty("project_data")['name'] # set MAKEOPTS # set USE # set CFLAGS @@ -132,12 +128,10 @@ class SetupBuildStepsForDocker(BuildStep): flunkOnFailure=True, name='Build docker buildbot-worker image', command=['docker', - 'buildx', 'build', '--file', dockerfile, '--build-arg', 'PROJECTUUID='+ self.buildargs['PROJECTUUID'], - '--build-arg', 'KEYWORDS=' + self.buildargs['KEYWORDS'], - '--build-arg', 'ARCH=' + self.buildargs['ARCH'], + '--build-arg', 'PROJECTNAME='+ self.buildargs['PROJECTNAME'], '--build-arg', 'BINHOSTURL=' + self.buildargs['BINHOSTURL'], '--build-arg', 'BOOTSTRAPTAG=' + self.buildargs['BOOTSTRAPTAG'], '--tag', image_data['tag'],