[Commits] Rev 64: Merge. in file:///Users/hakan/work/monty_program/mariadb-tools/

Hakan Kuecuekyilmaz hakan.kuecuekyilmaz at t-online.de
Tue Nov 9 03:04:03 EET 2010


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

------------------------------------------------------------
revno: 64 [merge]
revision-id: hakan at askmonty.org-20101109010402-vq74qx8bxf2goe2l
parent: hakan at askmonty.org-20101109010333-mrt3qxox1w4nq920
parent: knielsen at hasky-20101107215105-04b9rve23lfysd67
committer: Hakan Kuecuekyilmaz <hakan at askmonty.org>
branch nick: mariadb-tools
timestamp: Tue 2010-11-09 02:04:02 +0100
message:
  Merge.
modified:
  buildbot/maria-master.cfg      mariamaster.cfg-20091218103450-cvifjz3i70oerkej-1
-------------- next part --------------
=== modified file 'buildbot/maria-master.cfg'
--- a/buildbot/maria-master.cfg	2010-10-21 12:42:22 +0000
+++ b/buildbot/maria-master.cfg	2010-11-07 21:51:05 +0000
@@ -71,6 +71,7 @@
               ,mkSlave("mariadb-brs", max_builds=1)
               ,mkSlave("adutko-ultrasparc3", max_builds=1)
               ,mkSlave("philip-fedora13-quality1", max_builds=1)
+              ,mkSlave("mac-mini-intel", max_builds=1)
                ]
 
 # to limit to two concurrent builds on a slave, use
@@ -127,7 +128,10 @@
                 "lp:~maria-captains/maria/maria-5.3-mwl128" : "maria-5.3-mwl128",
                 "lp:~maria-captains/maria/maria-5.3-mwl106" : "maria-5.3-mwl106",
                 "lp:~maria-captains/maria/mariadb-5.1-mwl116" : "mariadb-5.1-mwl116",
-                "lp:~maria-captains/maria/mariadb-5.1-mwl132" : "mariadb-5.1-mwl132"
+                "lp:~maria-captains/maria/mariadb-5.1-mwl132" : "mariadb-5.1-mwl132",
+                "lp:~maria-captains/maria/mariadb-5.1-mwl136" : "mariadb-5.1-mwl136",
+                "lp:~maria-captains/maria/mariadb-5.1-mwl163" : "mariadb-5.1-mwl163",
+                "lp:~maria-captains/maria/maria-5.3-mwl128-dsmrr-cpk" : "maria-5.3-mwl128-dsmrr-cpk"
                 }
 mailSource = mail.BzrLaunchpadEmailMaildirSource("/var/lib/buildbot/Maildir",
                                                  branchMap=myBranchMap)
@@ -170,7 +174,8 @@
 #                  "lenny-amd64-dbg", "adutko-alpha",
                   "debian5-i386-fulltest",
 #                  "jaunty-x86-valgrind", "jaunty-amd64-rel",
-#                  "gentoo-x86-dbg", "ubuntu-x86-dbg",
+                  "gentoo-x86-dbg",
+#                  "ubuntu-x86-dbg",
                   "macosx-x86-bld", "work-amd64-valgrind",
 #                   "winxp-x86-nmake",
 #                  "win32-rel-nmake",
@@ -178,6 +183,7 @@
 #                  "gentoo-amd64-sanja",
 #                  "opensolaris-511-x86",
 #                  "sol10-amd64-dbg", "sol10-sparc32-forte", "sol10-sparc64-forte",
+                  "mac-mini-x86-dbg",
                   "sol-sparc-32"]))
 
 # A scheduler for less powerful hosts, only run on most important branches.
@@ -237,7 +243,7 @@
 c['schedulers'].append(AnyBranchScheduler(
     name="gcov",
     treeStableTimer=60,
-    branches=["5.1", "5.2", "5.3", "5.3-dsmrr-cpk"],
+    branches=["5.1", "5.2", "5.3", "5.3-dsmrr-cpk", "maria-5.3-mwl128"],
     builderNames=["gcov"]
 ))
 
@@ -254,7 +260,7 @@
 c['schedulers'].append(AnyBranchScheduler(
     name="kvmtest",
     branches=["mariadb-5.1-knielsen", "5.1-release", "5.1",
-              "5.1.39-oqgraph", "5.1-merge",
+              "5.1.39-oqgraph", "5.1-merge", "5.3",
               "mariadb-5.1-monty", "5.1-serg", "5.2-serg",
               "5.2", "mariadb-5.2-knielsen", "mariadb-5.2-monty",
               ],
@@ -271,7 +277,7 @@
 #                      "kvm-deb-debian6-amd64", "kvm-deb-debian6-x86",
 #                      "kvm-deb-debian4-amd64", "kvm-deb-debian4-x86",
                       "kvm-deb-hardy-amd64", "kvm-deb-hardy-x86",
-                      "kvm-deb-intrepid-amd64", "kvm-deb-intrepid-x86",
+#                      "kvm-deb-intrepid-amd64", "kvm-deb-intrepid-x86",
                       "kvm-deb-jaunty-amd64", "kvm-deb-jaunty-x86",
                       "kvm-deb-karmic-amd64", "kvm-deb-karmic-x86",
                       "kvm-deb-lucid-amd64", "kvm-deb-lucid-x86",
@@ -949,7 +955,7 @@
 #               }
 
 # The trees for which we save binary packages.
-savedPackageBranches= ["5.1", "5.1-release", "5.2", "5.2-release", "5.3-release", "mariadb-5.1-knielsen", "mariadb-5.2-knielsen"]
+savedPackageBranches= ["5.1", "5.1-release", "5.2", "5.2-release", "5.3-release", "mariadb-5.1-knielsen", "mariadb-5.2-knielsen", "5.3"]
 
 # Get a build step that will archive binary packages (or source tarball).
 # Only the newest 3 builds are saved for each (branch, builder) combination.
@@ -994,7 +1000,7 @@
 mkdir -p buildbot
 cd buildbot
 rm -Rf build
-bzr co "%(bakebranch:-lp:ourdelta)s" build
+bzr co "%(bakebranch:-lp:~maria-captains/ourdelta/ourdelta-montyprogram-fixes)s" build
 cd build
 bakery/preheat.sh
 echo bakery-[0-9]* > bakery.txt
@@ -1083,8 +1089,10 @@
         "exit $(cat buildbot/build/result.txt)",
         "= rm -Rf rpms && mkdir rpms",
         "= scp -P "+port+" 'buildbot at localhost:/usr/src/redhat/RPMS/"+arch+"/*.rpm' rpms/",
+        "= rm -Rf srpms && mkdir srpms",
+        "= scp -P "+port+" 'buildbot at localhost:/usr/src/redhat/SRPMS/*.rpm' srpms/",
     ]))
-    rpm_fact.addStep(getPackageArchiveStep("rpms", "%(tarbuildnum)s"))
+    rpm_fact.addStep(getPackageArchiveStep("rpms srpms", "%(tarbuildnum)s"))
     rpm_fact.addStep(Test(
         description=["testing", "install"],
         descriptionDone=["test", "install"],
@@ -1228,8 +1236,8 @@
 
 bld_kvm_deb_hardy_amd64 = getDebBuilder("kvm-deb-hardy-amd64", "vm-hardy-amd64", "2228", "qemu64")
 bld_kvm_deb_hardy_x86 = getDebBuilder("kvm-deb-hardy-x86", "vm-hardy-i386", "2229", "qemu32,-nx")
-bld_kvm_deb_intrepid_amd64 = getDebBuilder("kvm-deb-intrepid-amd64", "vm-intrepid-amd64", "2230", "qemu64")
-bld_kvm_deb_intrepid_x86 = getDebBuilder("kvm-deb-intrepid-x86", "vm-intrepid-i386", "2231", "qemu32,-nx")
+#bld_kvm_deb_intrepid_amd64 = getDebBuilder("kvm-deb-intrepid-amd64", "vm-intrepid-amd64", "2230", "qemu64")
+#bld_kvm_deb_intrepid_x86 = getDebBuilder("kvm-deb-intrepid-x86", "vm-intrepid-i386", "2231", "qemu32,-nx")
 bld_kvm_deb_karmic_amd64 = getDebBuilder("kvm-deb-karmic-amd64", "vm-karmic-amd64", "2232", "qemu64")
 bld_kvm_deb_karmic_x86 = getDebBuilder("kvm-deb-karmic-x86", "vm-karmic-i386", "2233", "qemu32,-nx")
 bld_kvm_deb_jaunty_amd64 = getDebBuilder("kvm-deb-jaunty-amd64", "vm-jaunty-amd64", "2235", "qemu64")
@@ -1480,7 +1488,7 @@
 
 f_rqg_weekend = factory.BuildFactory()
 f_rqg_weekend.addStep(Bzr(baseURL="http://bazaar.launchpad.net/%7Emaria-captains/maria/",
-                   defaultBranch="5.2",
+                   defaultBranch="5.1",
                    mode="clobber",
                    forceSharedRepo=True,
                    timeout = 4*3600))
@@ -1555,15 +1563,15 @@
 
 f_gcov.addStep(getMTR(
 	test_type="mtr-pbxt", test_info="PBXT test suite",
-	command=["sh", "-c", "cd mysql-test && exec perl mysql-test-run.pl --parallel=2 --mysqld=--loose-sync-sys=0 --suite=pbxt --mysqld=--default-storage-engine=pbxt --force --retry=1 --max-test-fail=100 --mysqld=--loose-innodb-fast-shutdown=2"],
+	command=["sh", "-c", "cd mysql-test && exec perl mysql-test-run.pl --parallel=2 --mysqld=--loose-sync-sys=0 --suite=pbxt --mysqld=--default-storage-engine=pbxt --force --retry=1 --max-test-fail=100 --mysqld=--loose-innodb-fast-shutdown=2 --nowarnings --skip-test=flush_read_lock_kill"],
 	))
 f_gcov.addStep(getMTR(
 	test_type="mtr-normal", test_info="Standard test suite",
-	command=["sh", "-c", "cd mysql-test && exec perl mysql-test-run.pl --mysqld=--loose-sync-sys=0 --mysqld=--loose_innodb_flush_log_at_trx_commit=2 --force --retry=1 --skip-ndb --parallel=3 --testcase-timeout=45 --max-test-fail=100 --skip-combinations --mysqld=--loose-innodb-fast-shutdown=2"],
+	command=["sh", "-c", "cd mysql-test && exec perl mysql-test-run.pl --mysqld=--loose-sync-sys=0 --mysqld=--loose_innodb_flush_log_at_trx_commit=2 --force --retry=1 --skip-ndb --parallel=3 --testcase-timeout=45 --max-test-fail=100 --skip-combinations --mysqld=--loose-innodb-fast-shutdown=2 --nowarnings"],
 	))
 f_gcov.addStep(getMTR(
 	test_type="mtr-xtra", test_info="Some additional test suites",
-	command=["sh", "-c", "cd mysql-test && exec perl mysql-test-run.pl --mysqld=--loose-sync-sys=0 --mysqld=--loose_innodb_flush_log_at_trx_commit=2 --suite=funcs_1,funcs_2,stress,jp --force --retry=1 --skip-ndb --parallel=3 --testcase-timeout=45 --max-test-fail=200 --mysqld=--loose-innodb-fast-shutdown=2"],
+	command=["sh", "-c", "cd mysql-test && exec perl mysql-test-run.pl --mysqld=--loose-sync-sys=0 --mysqld=--loose_innodb_flush_log_at_trx_commit=2 --suite=funcs_1,funcs_2,stress,jp --force --retry=1 --skip-ndb --parallel=3 --testcase-timeout=45 --max-test-fail=200 --mysqld=--loose-innodb-fast-shutdown=2 --nowarnings"],
 ))
 
 f_gcov.addStep(ShellCommand(
@@ -1592,6 +1600,31 @@
 
 # End of code coverage
 
+# Builder for  Hakan's Mac Mini.
+f_mac_mini = factory.BuildFactory()
+f_mac_mini.addStep(bzr_shared_repo)
+f_mac_mini.addStep(bzr_checkout)
+f_mac_mini.addStep(getCompileStep(["BUILD/compile-amd64-debug-max-no-ndb"]))
+f_mac_mini.addStep(getMTR(
+        test_type="nm",
+        test_info="Mac Mini debug:Normal run, mixed-mode replication, no --ps-protocol",
+        command=["sh", "-c", 'diskutil eject /Volumes/ramdisk ; diskutil erasevolume "Journaled HFS+" "ramdisk" $(hdiutil attach -nomount ram://3145728) ; rm -Rf mysql-test/var ; ln -s /Volumes/ramdisk mysql-test/var ; cd mysql-test && exec perl mysql-test-run.pl --force --retry=3 --parallel=3 --skip-ndb --mysqld=--binlog-format=mixed']))
+f_mac_mini.addStep(getMTR(
+        test_type="pr",
+        test_info="Mac Mini debug: prepared statement protocol, row-based replication",
+        command=["sh", "-c", 'diskutil eject /Volumes/ramdisk ; diskutil erasevolume "Journaled HFS+" "ramdisk" $(hdiutil attach -nomount ram://3145728) ; rm -Rf mysql-test/var ; ln -s /Volumes/ramdisk mysql-test/var ; cd mysql-test && exec perl mysql-test-run.pl --force --retry=3 --parallel=3 --skip-ndb --mysqld=--binlog-format=row --ps-protocol']))
+f_mac_mini.addStep(ShellCommand(command=["diskutil", "eject", "/Volumes/ramdisk"],
+                                description=["ejecting"], descriptionDone=["eject"],
+                                alwaysRun=True))
+
+bld_mac_mini_x86_dbg = {'name': "mac-mini-x86-dbg",
+               'slavename': "mac-mini-intel",
+               'builddir': "mac-mini-intel",
+               'factory': f_mac_mini,
+               "category": "experimental",
+              }
+
+
 
 c['builders'] = [bld_fulltest, bld_fulltest2, bld_work_valgrind, bld_gcov,
 #                 bld_valgrind_32, bld_rel_amd64,
@@ -1618,12 +1651,13 @@
                  bld_kvm_deb_debian5_amd64, bld_kvm_deb_debian5_x86,
 #                 bld_kvm_deb_debian6_amd64, bld_kvm_deb_debian6_x86,
                  bld_kvm_deb_hardy_amd64, bld_kvm_deb_hardy_x86,
-                 bld_kvm_deb_intrepid_amd64, bld_kvm_deb_intrepid_x86,
+#                 bld_kvm_deb_intrepid_amd64, bld_kvm_deb_intrepid_x86,
                  bld_kvm_deb_jaunty_amd64, bld_kvm_deb_jaunty_x86,
                  bld_kvm_deb_karmic_amd64, bld_kvm_deb_karmic_x86,
                  bld_kvm_deb_lucid_amd64, bld_kvm_deb_lucid_x86,
                  bld_kvm_bintar_hardy_amd64, bld_kvm_bintar_hardy_x86,
 #                 bld_opensolaris_511_x86,
+                 bld_mac_mini_x86_dbg,
                  ]
 
 
@@ -1638,6 +1672,9 @@
 from buildbot.status import html
 c['status'].append(html.WebStatus(http_port=8010, allowForce=True))
 
+from buildbot.status import html
+c['status'].append(html.WebStatus(http_port=8011, allowForce=False))
+
 from buildbot.status import words
 irc = words.IRC("irc.freenode.net", "mariabuildbot",
                 channels=["maria"],



More information about the commits mailing list