From patchwork Thu May 10 04:34:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Torrente X-Patchwork-Id: 27198 Received: (qmail 121616 invoked by alias); 10 May 2018 04:34:57 -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 121604 invoked by uid 89); 10 May 2018 04:34:56 -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=Hx-languages-length:2122, H*RU:209.85.216.194, Hx-spam-relays-external:209.85.216.194 X-HELO: mail-qt0-f194.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=u1oYm7dL3BXkVdV2zx5KCR0aBnipb6/+8kdeuycWEFQ=; b=AP7+5QziFvR1qTiFPFTbANJTEcxs/ETH8/tiZ+lgoDy/BIHWhWe9mjth2pIlZlZKbj 3oUtc4WIcWBvyjx2GDIuS1jQHS1gbC1jH/IJIit4WjWjVhEOseFQhKVyzncFjl1pMO5e z6YDxL9xgGEK0xFTolFNoaaqVb8fnHKjspnKCUzS4XQasgtnv3bpkQKLBFruNbcS3CPi n9LSU7Zvh9yud4Qk7TDpFGhhEMcLHZxKIOI+bTl7cGiks3edv0SsWAOQ06GPwfMRVtjv XGL2UG6qLGOKDF1GSvLEJd3K3qnAjQsFhGE+Dd7XTpYNRQJ6NaSjFR0WLBkHf1Qy27V1 7TFA== X-Gm-Message-State: ALKqPwdLGt/qzsS20Phn9k+ZO5ngB/+jPTJFy3vDHvYydwJY4SVez5Fy wJxyKPkhW5tlSLN9q0YUnHGdr6xTqdU= X-Google-Smtp-Source: AB8JxZorrP17GQRVHWQgW3Leb7ce49ej2/pZQMNWyiR44LS+TLU/ZVIlUhKCadLjvUf9SYXHJvC/8w== X-Received: by 2002:ac8:8b8:: with SMTP id v53-v6mr19575632qth.373.1525926893271; Wed, 09 May 2018 21:34:53 -0700 (PDT) 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:34:45 -0300 Message-Id: <20180510043446.10811-1-igormtorrente@gmail.com> From: Igor Torrente 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