changeset 58:07ac7f345b68

Finish the patches on buildbot and add a patch for the slides
author Louis Opter <louis@lse.epitech.net>
date Thu, 09 Feb 2012 18:45:18 +0100
parents de2840b08d0b
children 0b869f03ac04
files epitech_add_final_defense_slides.patch maintainers_add_fullbuild_factory_in_buildbot.patch maintainers_dont_log_en_in_buildbot.patch series
diffstat 4 files changed, 16 insertions(+), 81 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/epitech_add_final_defense_slides.patch	Thu Feb 09 18:45:18 2012 +0100
@@ -0,0 +1,15 @@
+# HG changeset patch
+# Parent d1252555fab3af261cdc1c14c0f82e96f13e242a
+epitech: add the slides for the final defense
+
+diff --git a/epitech/2012/CMakeLists.txt b/epitech/2012/CMakeLists.txt
+--- a/epitech/2012/CMakeLists.txt
++++ b/epitech/2012/CMakeLists.txt
+@@ -5,4 +5,5 @@
+ ADD_SUBDIRECTORY(rmll)
+ ADD_SUBDIRECTORY(copil) # Comité de pilotage (Steering Comitee)
+ ADD_SUBDIRECTORY(final_defense_tek4)
++ADD_SUBDIRECTORY(final_defense_tek5)
+ ADD_SUBDIRECTORY(tech_final_defense_tek5)
+diff --git a/epitech/2012/final_defense_tek5/CMakeLists.txt b/epitech/2012/final_defense_tek5/CMakeLists.txt
+new file mode 100644
--- a/maintainers_add_fullbuild_factory_in_buildbot.patch	Thu Feb 09 13:04:24 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-# HG changeset patch
-# Parent 087806bea06be2b7bdee624d1544788df5d4693d
-maintainers: rename the buildbot fullbuild_factory to incbuild_factory and add a real fullbuild_factory
-
-diff --git a/maintainers/buildbot/master/master-dotcloud.cfg b/maintainers/buildbot/master/master-dotcloud.cfg
---- a/maintainers/buildbot/master/master-dotcloud.cfg
-+++ b/maintainers/buildbot/master/master-dotcloud.cfg
-@@ -50,7 +50,8 @@
-                             name="all",
-                             change_filter=filter.ChangeFilter(branch='default'),
-                             treeStableTimer=None,
--                            builderNames=["fullbuild"]))
-+                            builderNames=["incbuild"]))
-+c['schedulers'].append(
- 
- ####### BUILDERS
- 
-@@ -62,10 +63,18 @@
- from buildbot.steps.source.mercurial import Mercurial
- from buildbot.steps.shell import ShellCommand, Configure, Compile, Test
- 
-+incbuild_factory = BuildFactory()
-+incbuild_factory.addStep(Mercurial(repourl='https://code.google.com/p/rathaxes', method='clean', branchType='inrepo', logEnviron=False))
-+incbuild_factory.addStep(ShellCommand(command=['cmake', '-E', 'make_directory', 'build'], lazylogfiles=True, logEnviron=False))
-+# The default is already build/ thus build/build
-+incbuild_factory.addStep(Configure(command=['cmake', '-DCMAKE_BUILD_TYPE=RELEASE', '..'], workdir='build/build', logEnviron=False))
-+incbuild_factory.addStep(Compile(workdir='build/build', logEnviron=False))
-+incbuild_factory.addStep(Test(workdir='build/build', logEnviron=False))
-+
- fullbuild_factory = BuildFactory()
--fullbuild_factory.addStep(Mercurial(repourl='https://code.google.com/p/rathaxes', method='clean', branchType='inrepo', logEnviron=False))
-+fullbuild_factory.addStep(Mercurial(repourl='https://code.google.com/p/rathaxes', method='fresh', branchType='inrepo', logEnviron=False))
-+fullbuild_factory.addStep(ShellCommand(command=['cmake', '-E', 'remove_directory', 'build'], lazylogfiles=True, logEnviron=False))
- fullbuild_factory.addStep(ShellCommand(command=['cmake', '-E', 'make_directory', 'build'], lazylogfiles=True, logEnviron=False))
--# The default is already build/ thus build/build
- fullbuild_factory.addStep(Configure(command=['cmake', '-DCMAKE_BUILD_TYPE=RELEASE', '..'], workdir='build/build', logEnviron=False))
- fullbuild_factory.addStep(Compile(workdir='build/build', logEnviron=False))
- fullbuild_factory.addStep(Test(workdir='build/build', logEnviron=False))
-@@ -74,9 +83,13 @@
- 
- c['builders'] = []
- c['builders'].append(
-+    BuilderConfig(name="incbuild",
-+        slavenames=["ubuntu_lucid_x86_64"],
-+        factory=incbuild_factory))
-+c['builders'].append(
-     BuilderConfig(name="fullbuild",
--      slavenames=["ubuntu_lucid_x86_64"],
--      factory=fullbuild_factory))
-+        slavenames=["ubuntu_lucid_x86_64"],
-+        factory=fullbuild_factory))
- 
- ####### STATUS TARGETS
- 
--- a/maintainers_dont_log_en_in_buildbot.patch	Thu Feb 09 13:04:24 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# HG changeset patch
-# Parent 1b0d553645e08fae7b919bfc162d8929aa7dbf63
-maintainers: don't log the environment variables on buildbot (it holds credentials on DotCloud)
-
-diff --git a/maintainers/buildbot/master/master-dotcloud.cfg b/maintainers/buildbot/master/master-dotcloud.cfg
---- a/maintainers/buildbot/master/master-dotcloud.cfg
-+++ b/maintainers/buildbot/master/master-dotcloud.cfg
-@@ -63,12 +63,12 @@
- from buildbot.steps.shell import ShellCommand, Configure, Compile, Test
- 
- fullbuild_factory = BuildFactory()
--fullbuild_factory.addStep(Mercurial(repourl='https://code.google.com/p/rathaxes', method='clean', branchType='inrepo'))
--fullbuild_factory.addStep(ShellCommand(command=['cmake', '-E', 'make_directory', 'build'], lazylogfiles=True))
-+fullbuild_factory.addStep(Mercurial(repourl='https://code.google.com/p/rathaxes', method='clean', branchType='inrepo', logEnviron=False))
-+fullbuild_factory.addStep(ShellCommand(command=['cmake', '-E', 'make_directory', 'build'], lazylogfiles=True, logEnviron=False))
- # The default is already build/ thus build/build
--fullbuild_factory.addStep(Configure(command=['cmake', '-DCMAKE_BUILD_TYPE=RELEASE', '..'], workdir='build/build'))
--fullbuild_factory.addStep(Compile(workdir='build/build'))
--fullbuild_factory.addStep(Test(workdir='build/build'))
-+fullbuild_factory.addStep(Configure(command=['cmake', '-DCMAKE_BUILD_TYPE=RELEASE', '..'], workdir='build/build', logEnviron=False))
-+fullbuild_factory.addStep(Compile(workdir='build/build', logEnviron=False))
-+fullbuild_factory.addStep(Test(workdir='build/build', logEnviron=False))
- 
- from buildbot.config import BuilderConfig
- 
--- a/series	Thu Feb 09 13:04:24 2012 +0100
+++ b/series	Thu Feb 09 18:45:18 2012 +0100
@@ -1,2 +1,1 @@
-maintainers_dont_log_en_in_buildbot.patch
-maintainers_add_fullbuild_factory_in_buildbot.patch
+epitech_add_final_defense_slides.patch