From patchwork Thu May 10 04:32:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Torrente X-Patchwork-Id: 911271 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-92384-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="LT7gzMcY"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40hL2R04t3z9s37 for ; Thu, 10 May 2018 14:33:34 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=rbHQ0NxjraJkIuqVOEP4NAg+CWGo+qAJb60yx5tcy400Tg0AHu5gA nmUr8nyzTIicT1/GAfIkxJWLd5q8uREVUV/HYMGL5Raq+4/Buu5QGMjzSYlvS1pQ OmnWmGDuSnxTzK5IZ3yKeNGrpx4kEu4IJy+dJbYTk4O7Llm8vM4+dc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=BdG/YHQLUfXpC/lyLIHYIUvuA/o=; b=LT7gzMcYOZ9LA+e8+/VD6GRi1Zyp YDV5C+8stPO6cULDE84QdN9BeUku6Jo1Yfudheot5s14awYnvnp3iaPi2g3WvaeS uNVrfiqOECaXj3AHQw1WKaUmDEbpkFbPGEOuIjGM5atbcPVbTFvKJemRBabbdnjD kNXyws1tgIQUUzI= Received: (qmail 113697 invoked by alias); 10 May 2018 04:33:29 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 113684 invoked by uid 89); 10 May 2018 04:33:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=H*Ad:D*outlook.com, HTo:D*br, 7113, sk:reserve X-HELO: mail-qt0-f193.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=G7w2f/0e0cRNhiiBcBq4l/ir1OyDXbGbfHqU0MD9noI=; b=r57vgzL0aMoaWi3zPYxRpGKn9kL9+TFxF3foeCa9F9G85dgqfoWO3xMAH3ZFXS7ByM pCXRvQfqs9q2CT2ao5ueL5b6YahoBLNDVPAI3qrEtMEy+S8LG00oUQuaOGHUl6tHZ33h jp+KhFmxCFWF8iuJ/cYQfCd5I/QwC/BZ66gt6GGiP8WneinzNLWbBAYrX0CNoWsow8FB CTLakLq6PVq0ustZZFD0cWfMHw4argwT6EL5F7DriGltEPyI4f2/Vv+FIjOiGJvzRxN+ wKWrBpI65d9ny0YRdErj20QrCCvMmABpwmdRKgIXXIHuhGmSw6t15pQq3fBTfwEyGwcU ihgQ== X-Gm-Message-State: ALQs6tDkliMolF5onmUypqaF7s+sMlLTQZ9RKUVUkTsVf5KNSLK7gjVt LDMbCdRgA8dDhqu5eMXyLxl4vk8+Mt4= X-Google-Smtp-Source: AB8JxZqKvDqPLFo+MTZjOzmeD13iG+nJA3YjzI5Z9e5KzhSgLeixdOLo9eIZwH9DTf/KlW0oDmd0Bg== X-Received: by 2002:ac8:1204:: with SMTP id x4-v6mr45649039qti.35.1525926805127; Wed, 09 May 2018 21:33:25 -0700 (PDT) From: Igor Torrente X-Google-Original-From: Igor Torrente To: libc-alpha@sourceware.org, rodolfo@ic.unicamp.br Cc: Igor Torrente Subject: [PATCH] Add multi-slave builders Date: Thu, 10 May 2018 01:32:57 -0300 Message-Id: <20180510043258.10703-1-igortorrente@outlook.com> Implementation of muiti-slave builders. This patch will make easy creation of multi-slave builders for buildbot. --- master.cfg | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/master.cfg b/master.cfg index 9ecb3f4..164d309 100644 --- a/master.cfg +++ b/master.cfg @@ -18,18 +18,21 @@ import slavepasswd # a shorter alias to save typing. c = BuildmasterConfig = {} +# Map builders to a set of slaves(workers). builder_map = { - 'glibc-x86_64-linux': 'glibc-ubuntu-trusty-slave2', - 'glibc-i686-linux': 'glibc-ubuntu-trusty-slave2', - 'glibc-power8-linux': 'fedora25-ppc64-power8-1', - 'glibc-ppc-linux': 'debian8-ppc-power8-1', - 'glibc-ppc64le-linux': 'fedora25-ppc64le-power8-1', - 'glibc-s390x-linux': 'marist-fedora-s390x', - 'glibc-aarch64-linux': 'reservedbit-xgene-ubuntu-aarch64', + 'glibc-x86_64-linux':['glibc-ubuntu-trusty-slave2'], + 'glibc-i686-linux': ['glibc-ubuntu-trusty-slave2'], + 'glibc-power8-linux': ['fedora25-ppc64-power8-1'], + 'glibc-ppc-linux': ['debian8-ppc-power8-1'], + 'glibc-ppc64le-linux': ['fedora25-ppc64le-power8-1'], + 'glibc-s390x-linux': ['marist-fedora-s390x'], + 'glibc-aarch64-linux': ['reservedbit-xgene-ubuntu-aarch64'], } +# Sets with all builders and all slaves. builders = sorted(set(builder_map.iterkeys())) -slaves = sorted(set(builder_map.itervalues())) +slaves = sorted(set(slave for slave_list in (builder_map.itervalues()) + for slave in slave_list)) ####### BUILDSLAVES @@ -68,10 +71,13 @@ c['schedulers'].append(ForceScheduler( from AnnotatedFactory import getGlibcAnnotatedFactory from buildbot.config import BuilderConfig -c['builders'] = [BuilderConfig(name = builder, - slavename = slave, - factory = getGlibcAnnotatedFactory()) - for builder, slave in builder_map.iteritems()] +# Creation of all builders. +c['builders'] = [] +for builder in builder_map: + c['builders'].append(BuilderConfig( + name = builder, + slavenames= builder_map[builder], + factory = getGlibcAnnotatedFactory())) ####### STATUS TARGETS