[PATCH] Add multi-slave builders

[PATCH] Add multi-slave builders

[Igor Torrente]

From: Igor Torrente <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
 
-- 
2.1.4

[PATCH] Add two new compilation options

[Igor Torrente]

From: Igor Torrente <igortorrente@outlook.com>

Add two new compilation options for Power 8 architecture.

---
 scripts/slave/buildbot_selector.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/slave/buildbot_selector.py b/scripts/slave/buildbot_selector.py
index 6c2394b..f84d708 100755
--- a/scripts/slave/buildbot_selector.py
+++ b/scripts/slave/buildbot_selector.py
@@ -21,6 +21,14 @@ BOT_ASSIGNMENT = {
         '--with-cpu=power8',
         '--enable-lock-elision',
     ]),
+    'glibc-ppc64le-linux-p8-nomultiarch': bash('glibc-native.sh', [
+        '--with-cpu=power8',
+        '--disable-multi-arch',
+    ]),
+    'glibc-ppc64le-linux-p8-notunables': bash('glibc-native.sh', [
+        '--with-cpu=power8',
+        '--disable-tunables',
+    ]),
     'glibc-ppc-linux': bash('glibc-native.sh', [
         '--build=powerpc-linux',
         'CC=gcc -m32',
-- 
2.1.4

Re: [PATCH] Add two new compilation options

[Siddhesh Poyarekar]

On 05/10/2018 10:04 AM, Igor Torrente wrote:
> From: Igor Torrente <igortorrente@outlook.com>
> 
> Add two new compilation options for Power 8 architecture.

Thanks, before I commit this, can you please confirm that you've 
coordinated[1] with Tulio for login details to set up the slave?

Thanks,
Siddhesh

[1] https://sourceware.org/glibc/wiki/Buildbot

Re: [PATCH] Add two new compilation options

[Siddhesh Poyarekar]

Sorry, I realized Tulio's contact details are not in there, I've cc'd 
him now.

Siddhesh

On 05/10/2018 11:31 AM, Siddhesh Poyarekar wrote:
> On 05/10/2018 10:04 AM, Igor Torrente wrote:
>> From: Igor Torrente <igortorrente@outlook.com>
>>
>> Add two new compilation options for Power 8 architecture.
> 
> Thanks, before I commit this, can you please confirm that you've 
> coordinated[1] with Tulio for login details to set up the slave?
> 
> Thanks,
> Siddhesh
> 
> [1] https://sourceware.org/glibc/wiki/Buildbot

Re: [PATCH] Add two new compilation options

[Tulio Magno Quites Machado Filho]

Siddhesh Poyarekar <siddhesh@gotplt.org> writes:

> On 05/10/2018 10:04 AM, Igor Torrente wrote:
>> From: Igor Torrente <igortorrente@outlook.com>
>> 
>> Add two new compilation options for Power 8 architecture.
>
> Thanks, before I commit this, can you please confirm that you've 
> coordinated[1] with Tulio for login details to set up the slave?

We haven't yet, because these patches are not adding new slaves.
That's the next step.
Anyway Igor knows how to contact me.  :-)

Thanks!

-- 
Tulio Magno