Adding AIX buildslave and builder; adjusting JSON file and reader
This commit is contained in:
parent
4c11d1f368
commit
ad1a384479
2 changed files with 36 additions and 1 deletions
|
@ -18,6 +18,9 @@
|
||||||
{ "name" : "fedora-ppc64le-1", "arch" : "ppc64le", "jobs" : "16",
|
{ "name" : "fedora-ppc64le-1", "arch" : "ppc64le", "jobs" : "16",
|
||||||
"admin" : "emachado@linux.vnet.ibm.com" },
|
"admin" : "emachado@linux.vnet.ibm.com" },
|
||||||
|
|
||||||
|
{ "name" : "power7-aix-1", "arch" : "power7", "jobs" : "4",
|
||||||
|
"admin" : "dje.gcc@gmail.com" },
|
||||||
|
|
||||||
{ "name" : "koobs-freebsd8", "arch" : "x86_64", "jobs" : "1",
|
{ "name" : "koobs-freebsd8", "arch" : "x86_64", "jobs" : "1",
|
||||||
"admin" : "sergiodj@redhat.com" },
|
"admin" : "sergiodj@redhat.com" },
|
||||||
{ "name" : "koobs-freebsd9", "arch" : "x86_64", "jobs" : "1",
|
{ "name" : "koobs-freebsd9", "arch" : "x86_64", "jobs" : "1",
|
||||||
|
@ -148,7 +151,14 @@
|
||||||
{ "name" : "Fedora-ppc64le-cc-with-index",
|
{ "name" : "Fedora-ppc64le-cc-with-index",
|
||||||
"type" : "IndexBuild",
|
"type" : "IndexBuild",
|
||||||
"builddir" : "fedora-ppc64le-cc-with-index",
|
"builddir" : "fedora-ppc64le-cc-with-index",
|
||||||
"slavenames" : [ "fedora-ppc64le-1" ] }
|
"slavenames" : [ "fedora-ppc64le-1" ] },
|
||||||
|
|
||||||
|
|
||||||
|
{ "name" : "AIX-Power7-plain",
|
||||||
|
"type" : "GDBPlainAIX",
|
||||||
|
"builddir" : "aix-power7-plain",
|
||||||
|
"slavenames" : [ "aix-power7-1" ],
|
||||||
|
"PATH" : "/opt/freeware/bin:/usr/bin:/etc:/usr/sbin:/usr/ucb:/home/sergiodj/bin:/usr/bin/X11:/sbin:." }
|
||||||
],
|
],
|
||||||
|
|
||||||
"schedulers" : [ { "type" : "AnyBranchScheduler", "name" : "master",
|
"schedulers" : [ { "type" : "AnyBranchScheduler", "name" : "master",
|
||||||
|
|
25
master.cfg
25
master.cfg
|
@ -781,6 +781,21 @@ class RunTestGDBIndexBuildBSD (RunTestGDBIndexBuild, RunTestGDBBSD_Common):
|
||||||
"""Testing with the "cc-with-tweaks.sh" passing -i. FIXME: include bitness here."""
|
"""Testing with the "cc-with-tweaks.sh" passing -i. FIXME: include bitness here."""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
# Classes needed for AIX systems
|
||||||
|
|
||||||
|
class RunTestGDBAIX_Common (BuildAndTestGDBFactory):
|
||||||
|
"""Common AIX test configurations"""
|
||||||
|
def __init__ (self, **kwargs):
|
||||||
|
# Unfortunately we have to disable -Werror there...
|
||||||
|
self.extra_conf_flags = [ '--disable-werror' ]
|
||||||
|
self.make_command = 'gmake'
|
||||||
|
self.extra_make_flags = [ 'MAKEINFO=true' ]
|
||||||
|
BuildAndTestGDBFactory.__init__ (self, **kwargs)
|
||||||
|
|
||||||
|
class RunTestGDBPlainAIX (RunTestGDBPlain_c64t64, RunTestGDBBSD_Common):
|
||||||
|
"""Compiling for AIX"""
|
||||||
|
pass
|
||||||
|
|
||||||
# All branches that are going to be watched.
|
# All branches that are going to be watched.
|
||||||
all_gdb_filter = ChangeFilter (branch_fn = should_watch_branch)
|
all_gdb_filter = ChangeFilter (branch_fn = should_watch_branch)
|
||||||
|
|
||||||
|
@ -849,6 +864,7 @@ def load_config (c):
|
||||||
|
|
||||||
c['builders'] = []
|
c['builders'] = []
|
||||||
for b in config['builders']:
|
for b in config['builders']:
|
||||||
|
myenv = {}
|
||||||
if 'arch_triplet' in b:
|
if 'arch_triplet' in b:
|
||||||
architecture_triplet = [ b.pop ('arch_triplet') ]
|
architecture_triplet = [ b.pop ('arch_triplet') ]
|
||||||
else:
|
else:
|
||||||
|
@ -858,6 +874,15 @@ def load_config (c):
|
||||||
b['factory'] = factory (architecture_triplet = architecture_triplet)
|
b['factory'] = factory (architecture_triplet = architecture_triplet)
|
||||||
b['canStartBuild'] = DefaultGDBCanStartBuild
|
b['canStartBuild'] = DefaultGDBCanStartBuild
|
||||||
b['mergeRequests'] = False
|
b['mergeRequests'] = False
|
||||||
|
|
||||||
|
# AIX hack. Sigh...
|
||||||
|
try:
|
||||||
|
mypath = b.pop ('PATH')
|
||||||
|
myenv['PATH'] = mypath
|
||||||
|
b['env'] = myenv
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
c['builders'].append (b)
|
c['builders'].append (b)
|
||||||
|
|
||||||
load_config (c)
|
load_config (c)
|
||||||
|
|
Loading…
Reference in a new issue