* oln_master.cfg: Here.
---
buildbot/masters/ChangeLog | 6 ++++
buildbot/masters/oln_master.cfg | 50 +++++++++++++++++++++-----------------
2 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog
index 5e09d11..6c535de 100644
--- a/buildbot/masters/ChangeLog
+++ b/buildbot/masters/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-30 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Disable the Olena Mac OS X (10.4)-on-PowerPC build (antalya is down).
+
+ * oln_master.cfg: Here.
+
2010-08-03 Roland Levillain <roland(a)lrde.epita.fr>
Add distcheck_configure_args to Olena ICC builds.
diff --git a/buildbot/masters/oln_master.cfg b/buildbot/masters/oln_master.cfg
index be473f5..9b584f7 100644
--- a/buildbot/masters/oln_master.cfg
+++ b/buildbot/masters/oln_master.cfg
@@ -46,7 +46,9 @@ c['schedulers'].append(AnyBranchScheduler(name='all',
branches=None,
treeStableTimer=10*60,
# When a change occurs, wait 10 minutes before
# lunching the build.
-
builderNames=['powerpc-apple-darwin8-gcc-4.0.1',
+ builderNames=[
+ # 2010-07-30: Disabled.
+ #
'powerpc-apple-darwin8-gcc-4.0.1',
'i486-linux-gnu-gcc-3.3',
'i486-linux-gnu-gcc-4.1',
'i486-linux-gnu-gcc-4.2',
@@ -62,7 +64,8 @@ c['schedulers'].append(AnyBranchScheduler(name='all',
branches=None,
# buildslave's mktap invocation.
from buildbot.buildslave import BuildSlave
c['slaves'] = [
- BuildSlave('bot-macppc', 'Yk]0"gQVE<N>{_'),
+ # 2010-07-30: Disabled.
+ # BuildSlave('bot-macppc', 'Yk]0"gQVE<N>{_'),
BuildSlave('bot-linux-gcc3', 'X_!H%#2/t6,r8$'),
BuildSlave('bot-linux-gcc4', 'fZLgd,R*8z.TZ)'),
BuildSlave('bot-linux-icc10', '1up/kRAE/jnG$3'),
@@ -223,20 +226,21 @@ f_oln_unix_icc_11 = GNUBuildSystem(project_repos='olena',
)
-f_oln_mac = GNUBuildSystem(project_repos='olena',
- branch=mybranch,
- scm_step=checkout,
- extra_configure_args='--enable-tools \
- --enable-apps \
- --enable-trimesh',
- install_cmd=None,
- dist_cmd=None,
- upload_cmd=None,
- extra_ld_library_path='/lrde/dev/linux-x86/stable/gdcm/lib',
- distcheck_configure_args='--enable-tools \
- --enable-apps \
- --enable-trimesh'
- )
+# 2010-07-30: Disabled.
+# f_oln_mac = GNUBuildSystem(project_repos='olena',
+# branch=mybranch,
+# scm_step=checkout,
+# extra_configure_args='--enable-tools \
+# --enable-apps \
+# --enable-trimesh',
+# install_cmd=None,
+# dist_cmd=None,
+# upload_cmd=None,
+# extra_ld_library_path='/lrde/dev/linux-x86/stable/gdcm/lib',
+# distcheck_configure_args='--enable-tools \
+# --enable-apps \
+# --enable-trimesh'
+# )
f_oln_unix_gcc3 = GNUBuildSystem(project_repos='olena',
project_name='olena',
@@ -259,11 +263,12 @@ f_oln_unix_gcc3 = GNUBuildSystem(project_repos='olena',
--enable-all --disable-scribo'
)
-builder_oln_macppc = {'name': 'powerpc-apple-darwin8-gcc-4.0.1',
- 'slavename': 'bot-macppc',
- 'builddir': 'oln_macppc',
- 'factory': f_oln_mac
- }
+# 2010-07-30: Disabled.
+# builder_oln_macppc = {'name': 'powerpc-apple-darwin8-gcc-4.0.1',
+# 'slavename': 'bot-macppc',
+# 'builddir': 'oln_macppc',
+# 'factory': f_oln_mac
+# }
builder_oln_linux_gcc3 = {'name': 'i486-linux-gnu-gcc-3.3',
'slavename': 'bot-linux-gcc3',
@@ -302,7 +307,8 @@ builder_oln_64 = {'name': 'x86-64-linux-gnu-gcc-4.1',
}
c['builders'] = [
- builder_oln_macppc,
+ # 2010-07-30: Disabled.
+ # builder_oln_macppc,
builder_oln_linux_gcc3,
builder_oln_linux_gcc4_1,
builder_oln_linux_gcc4_2,
--
1.5.6.5