maria-developers team mailing list archive

[Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>]

At file:///Users/hakan/work/monty_program/mariadb-tools/

------------------------------------------------------------
revno: 31 [merge]
revision-id: hakan@xxxxxxxxxxxx-20100331181744-71hyuyjjlijrsl68
parent: hakan@xxxxxxxxxxxx-20100331181651-pxx2ep0u5658d6q1
parent: knielsen@hasky-20100329172857-9qy2lqbl892ikh89
committer: Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>
branch nick: mariadb-tools
timestamp: Wed 2010-03-31 20:17:44 +0200
message:
  Merge.
modified:
  buildbot/maria-master.cfg      mariamaster.cfg-20091218103450-cvifjz3i70oerkej-1

=== modified file 'buildbot/maria-master.cfg'
--- a/buildbot/maria-master.cfg	2010-02-23 07:48:54 +0000
+++ b/buildbot/maria-master.cfg	2010-03-29 17:28:57 +0000
@@ -114,7 +114,8 @@
                 "lp:~maria-captains/maria/5.2-dsmrr" : "5.2-dsmrr",
                 "lp:~maria-captains/maria/5.3" : "5.3",
                 "lp:~maria-captains/maria/5.3-sj-subqueries" : "5.3-sj-subqueries",
-                "lp:~maria-captains/maria/5.3-subqueries" : "5.3-subqueries"
+                "lp:~maria-captains/maria/5.3-subqueries" : "5.3-subqueries",
+                "lp:~maria-captains/maria/maria-5.2-wl85" : "maria-5.2-wl85"
                 }
 mailSource = mail.BzrLaunchpadEmailMaildirSource("/var/lib/buildbot/Maildir",
                                                  branchMap=myBranchMap)
@@ -155,11 +156,11 @@
               "mariadb-5.1-monty", "mariadb-5.2-monty",
               "mariadb-5.1-knielsen","5.1-release", "5.1-merge",
               "maria-5.1-wl24", "maria-5.1-vcol","maria-5.1-wl36","mysql-5.1-mwl36",
-              "5.1.39-oqgraph", "5.2-dsmrr", "5.3", "5.3-sj-subqueries", "5.3-subqueries"
+              "5.1.39-oqgraph", "5.2-dsmrr", "5.3", "5.3-sj-subqueries", "5.3-subqueries",
+              "maria-5.2-wl85"
               ],
     treeStableTimer=60, # 1 sec for bzr
-    builderNames=["centos5-debug", "hardy-x86-rtai", "hardy-amd64-makedist",
-                  "hardy-amd64-dbg",
+    builderNames=["centos5-debug", "hardy-amd64-makedist",
 #                  "lenny-amd64-dbg", "adutko-alpha",
                   "debian5-i386-fulltest",
                   "jaunty-x86-valgrind", "jaunty-amd64-rel",
@@ -170,6 +171,19 @@
                   "sol10-amd64-dbg", "sol10-sparc32-forte", "sol10-sparc64-forte",
                   "sol-sparc-32"]))
 
+# A scheduler for less powerful hosts, only run on most important branches.
+c['schedulers'].append(AnyBranchScheduler(
+    name="mariadb-light",
+    branches=["5.1", "5.2",
+              "mariadb-5.1-knielsen",
+              "5.1-release", "5.1-merge",
+              "5.2-release", "5.2-merge",
+              "5.3-release", "5.3-merge",
+              ],
+    treeStableTimer=60, # 1 sec for bzr
+    builderNames=["hardy-x86-rtai", "hardy-amd64-dbg",
+                  ]))
+
 c['schedulers'].append(Triggerable(
         name="tarbuild-sched",
         builderNames=["win32-tarball", "win32-make-noinstall-zip", "centos5-amd64-minimal"]))
@@ -298,7 +312,7 @@
 f1.addStep(getMTR(
         test_type="nm",
         test_info="Valgrind run, no --ps-protocol",
-        command=["sh", "-c", "cd mysql-test && exec perl mysql-test-run.pl --mem --parallel=3 --valgrind --force --retry=3 --skip-ndb"]))
+        command=["sh", "-c", "cd mysql-test && exec perl mysql-test-run.pl --mem --parallel=3 --valgrind --valgrind-option=--show-reachable=yes --valgrind-option=--gen-suppressions=all --force --retry=3 --skip-ndb"]))
 
 bld_valgrind = {'name': "hardy-amd64-valgrind",
                 'slavename': "valgrind",
@@ -428,7 +442,8 @@
 
 f_rel_1_32 = factory.BuildFactory()
 f_rel_1_32.addStep(bzr_checkout)
-f_rel_1_32.addStep(getCompileStep(["BUILD/compile-pentium-max"]))
+f_rel_1_32.addStep(getCompileStep(["BUILD/compile-pentium-max"],
+                                  env={"AM_MAKEFLAGS": "-j1", "EXTRA_FLAGS": "-DFORCE_INIT_OF_VARS"}))
 # --testcase-timeout as this host is really slow at some tests.
 f_rel_1_32.addStep(getMTR(
         test_type="nm",
@@ -482,6 +497,7 @@
                      'slavename': "archivist-cnc",
                      'builddir': "archivist-cnc",
                      'factory': f_rel_1_32,
+                     "env": { "AM_MAKEFLAGS": "-j1" },
                      "category": "experimental",
                      }
 
@@ -489,6 +505,7 @@
                      'slavename': "archivist-amd64",
                      'builddir': "archivist-amd64",
                      'factory': f_dbg_2_64,
+                       "env": { "AM_MAKEFLAGS": "-j1" },
                        "category": "main",
                      }
 
@@ -514,7 +531,7 @@
         command=["sh", "-c", WithProperties("rm -Rf %(distname)s && tar zxf %(distname)s.tar.gz")]))
 f_minimal.addStep(getCompileStep(
         ["sh", "-c", WithProperties("cd %(distname)s && ./configure --without-uca --without-query-cache --without-geomery --without-readline --without-libedit --without-embedded-server --without-plugin-example --without-plugin-innobase --without-plugin-federated --without-plugin-pbxt --without-plugin-partition --without-plugin-daemon_example --without-plugin-ftexample --without-plugin-archive --without-plugin-blackhole --without-plugin-ibmdb2i --without-plugin-ndbcluster && make -j3")],
-        subdir="%(distname)s"))
+        subdir="%(distname)s/"))
 f_minimal.addStep(getMTR(
         test_type="nm",
         test_info="Normal run, no --ps-protocol",
@@ -1134,8 +1151,9 @@
 bld_kvm_deb_lucid_x86 = getDebBuilder("kvm-deb-lucid-x86", "vm-lucid-i386", "2239", "qemu32,-nx")
 bld_kvm_deb_debian5_amd64 = getDebBuilder("kvm-deb-debian5-amd64", "vm-debian5-amd64", "2234", "qemu64")
 bld_kvm_deb_debian5_x86 = getDebBuilder("kvm-deb-debian5-x86", "vm-debian5-i386", "2226", "qemu32,-nx")
-bld_kvm_deb_debian4_amd64 = getDebBuilder("kvm-deb-debian4-amd64", "vm-debian4-amd64", "2240", "qemu64", kvmargs=["--netdev=e1000",  "--kvm=-cdrom", "--kvm=/kvm/debian-40r8-amd64-netinst.iso"])
-bld_kvm_deb_debian4_x86 = getDebBuilder("kvm-deb-debian4-x86", "vm-debian4-i386", "2241", "qemu32,-nx", kvmargs=["--netdev=e1000",  "--kvm=-cdrom", "--kvm=/kvm/debian-40r8-i386-netinst.iso"])
+# Some serious kvm/kernel problem on debian4, need aggressive retry
+bld_kvm_deb_debian4_amd64 = getDebBuilder("kvm-deb-debian4-amd64", "vm-debian4-amd64", "2240", "qemu64", kvmargs=["--netdev=e1000",  "--kvm-retries=20", "--kvm=-cdrom", "--kvm=/kvm/debian-40r8-amd64-netinst.iso"])
+bld_kvm_deb_debian4_x86 = getDebBuilder("kvm-deb-debian4-x86", "vm-debian4-i386", "2241", "qemu32,-nx", kvmargs=["--netdev=e1000",  "--kvm-retries=20", "--kvm=-cdrom", "--kvm=/kvm/debian-40r8-i386-netinst.iso"])
 
 
 def getBintarBuilder(name, kvm_image, port, cpu):
@@ -1221,7 +1239,7 @@
         description="untarring", descriptionDone="untar",
         command=["sh", "-c", WithProperties("rm -Rf %(distdirname)s && tar zxf %(distname)s")]))
 f_sol_64_bintar.addStep(getCompileStep(["sh", "-c", WithProperties("cd %(distdirname)s && BUILD/compile-solaris-amd64-debug")],
-                                       subdir="%(distdirname)s"))
+                                       subdir="%(distdirname)s/"))
 f_sol_64_bintar.addStep(ShellCommand(
         description="packaging", descriptionDone="package",
         command=["sh", "-c", WithProperties("""