From patchwork Tue Nov 7 17:21:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Torrente X-Patchwork-Id: 835374 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-86866-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="h8YL4AcP"; 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 3yWbqf2GyDz9s3w for ; Wed, 8 Nov 2017 04:23:26 +1100 (AEDT) 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=AX7I8Lp8E+0PkqFEU03vIPdZsgmxmLJfew0hWBBOgud7LNjwgBg39 h6ZsxSMfwF7YIJS/YA1K1dMq+NmVobrTiDYCP707GgatBMKZbsDKEfuXDse7/jaL uq7a7VaeiL5jndCcdOJ58yRhRoGVCKIfrtPC8w/rhX66u1QaOcK2Hs= 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=N8JkWzUVgZOGVLgUM/Hh44xeuOE=; b=h8YL4AcPOO5A8K7v8Ko4PXcB4Czc dwNLKMdKAg68j0D8RUWkojtgdsecnipl+mRi3KdQjde4tNBCK/t4SSB9owOuFFnh T2ojiXf0vP4IhBQG+YWmTD0ZBOUfItqd7yS23h3/VLcB9n6Rcq7n0iOu+y8qPdrr ZfgGJEIKHFKXoz0= Received: (qmail 123299 invoked by alias); 7 Nov 2017 17:23:19 -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 123288 invoked by uid 89); 7 Nov 2017 17:23:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=1821 X-HELO: mail-qk0-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=BXhz4W+FXG2X5/nreE6CqZ/04waEwt5p2npjOwrzh5w=; b=P/6Xew3VWyLAPuWZ/s/x7yatTnIPdZ3o6AcSXqiE7dw8GgWoej3DnY4/uCbX5Hcjsd 9TuXuqtgfA2umrbHibUSJKcpn9cXEjskcFTIYpBh5W/UJ7zIqzpprvLo6YYLiou91l72 2YC8Xd7GSCCJwO6ZLbRSA3QfJIYwUZZrrxOwrlnMEMgaDoRbkYG7Me/4lY7Lcl4fH20z fSBpT3MCX7KJxZCR4PfWiXax9C5qAoPBzDbSejLlmv+ZB/xQYbwJAuqj1jwAvJdUmWi3 RTpibbzAWmNEnU0JEgTrf56xc4v2L11N4IH6h+MoTY7NjHslEq4JSdIGMtwVdEkPGsNH LM6w== X-Gm-Message-State: AMCzsaUhMLx4D01xYmz0VeSU2AsGbZ/A70SsksSlxLjSmgBJm5oATUVb +sp5S1RulfqiW0Wkit54kdDFFz+r X-Google-Smtp-Source: ABhQp+QT1iBRIaPzvPRBGHP8D70jsHlsB9gD8GeHTlk/jiyMN3HlrofIa6phayRORFuLGFcSeywMgA== X-Received: by 10.55.101.4 with SMTP id z4mr28417287qkb.114.1510075395999; Tue, 07 Nov 2017 09:23:15 -0800 (PST) From: Igor Torrente X-Google-Original-From: Igor Torrente To: libc-alpha@sourceware.org Cc: tuliom@linux.vnet.ibm.com, Igor Torrente Subject: [PATCH] Add multi-slave builders Date: Tue, 7 Nov 2017 15:21:18 -0200 Message-Id: <20171107172118.11613-1-igortorrente@outlook.com> Implementation of muiti-slave builders. This patch will make easy creation of multi-slave builders. --- 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