buildbot: adjust the location and slavenames for the mac64-intel and mac-intel-10_5 builds (r+dschaffe)
authorBrent Baker <brbaker@adobe.com>
Tue, 22 Jun 2010 10:17:28 -0400
changeset 4850 4cc85c75004e665398a7f065dbdb7d0490a3da7b
parent 4849 8e372ec48f0ce4e3b75973d6afd669ae823469bb
child 4851 9434ee71ce19753832fefabe74d987e0e63ec651
push id2565
push userbrbaker@adobe.com
push dateTue, 22 Jun 2010 14:17:41 +0000
buildbot: adjust the location and slavenames for the mac64-intel and mac-intel-10_5 builds (r+dschaffe)
build/buildbot/master/argo.py
build/buildbot/master/master.cfg
build/buildbot/master/sandbox.py
build/buildbot/master/tamarinredux.py
build/buildbot/slaves/mac-intel-10_5/buildbot.tac
build/buildbot/slaves/mac64-intel/buildbot.tac
--- a/build/buildbot/master/argo.py
+++ b/build/buildbot/master/argo.py
@@ -297,17 +297,17 @@ class argo:
     mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_105_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_105_compile_builder = {
                 'name': "mac-intel-10.5-compile-argo",
-                'slavename': "asteammac1",
+                'slavename': "asteammac12-10_5",
                 'factory': mac_intel_105_compile_factory,
                 'builddir': './argo-mac-intel-10_5-compile',
     }
 
 
     ##########################################
     #### builder for mac-intel-64-compile ####
     ##########################################
@@ -327,17 +327,17 @@ class argo:
     mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_64_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_64_compile_builder = {
                 'name': "mac64-intel-compile-argo",
-                'slavename': "asteammac1-64bit",
+                'slavename': "asteammac12-64bit",
                 'factory': mac_intel_64_compile_factory,
                 'builddir': './argo-mac64-intel-compile',
     }
 
 
     ############################################
     #### builder for mac-ppc-10_4a-compile ####
     ############################################
@@ -784,33 +784,33 @@ class argo:
     ##########################################
     mac_intel_105_smoke_factory = factory.BuildFactory()
     mac_intel_105_smoke_factory.addStep(download_testmedia)
     mac_intel_105_smoke_factory.addStep(test_smoke)
     mac_intel_105_smoke_factory.addStep(util_process_clean)
 
     mac_intel_105_smoke_builder = {
                 'name': "mac-intel-10.5-smoke-argo",
-                'slavename': "asteammac1",
+                'slavename': "asteammac12-10_5",
                 'factory': mac_intel_105_smoke_factory,
                 'builddir': './argo-mac-intel-10_5-smoke',
     }
 
 
     #######################################
     #### builder for mac64-intel-smoke ####
     #######################################
     mac_intel_64_smoke_factory = factory.BuildFactory()
     mac_intel_64_smoke_factory.addStep(download_testmedia)
     mac_intel_64_smoke_factory.addStep(test_smoke)
     mac_intel_64_smoke_factory.addStep(util_process_clean)
 
     mac_intel_64_smoke_builder = {
                 'name': "mac64-intel-smoke-argo",
-                'slavename': "asteammac1-64bit",
+                'slavename': "asteammac12-64bit",
                 'factory': mac_intel_64_smoke_factory,
                 'builddir': './argo-mac64-intel-smoke',
     }
 
     #########################################
     #### builder for mac-ppc-10_4a-smoke ####
     #########################################
     mac_ppc_104a_smoke_factory = factory.BuildFactory()
@@ -1138,17 +1138,17 @@ class argo:
     mac_intel_105_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     mac_intel_105_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     mac_intel_105_test_factory.addStep(test_differential)
     mac_intel_105_test_factory.addStep(util_process_clean)
     mac_intel_105_test_factory.addStep(util_clean_buildsdir)
 
     mac_intel_105_test_builder = {
                 'name': "mac-intel-10.5-test-argo",
-                'slavename': "asteammac1",
+                'slavename': "asteammac12-10_5",
                 'factory': mac_intel_105_test_factory,
                 'builddir': './argo-mac-intel-10_5-test',
     }
 
 
     ######################################
     #### builder for mac64-intel-test ####
     ######################################
@@ -1162,17 +1162,17 @@ class argo:
     mac_intel_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(util_process_clean)
     mac_intel_64_test_factory.addStep(util_clean_buildsdir)
 
     mac_intel_64_test_builder = {
                 'name': "mac64-intel-test-argo",
-                'slavename': "asteammac1-64bit",
+                'slavename': "asteammac12-64bit",
                 'factory': mac_intel_64_test_factory,
                 'builddir': './argo-mac64-intel-test',
     }
 
     ########################################
     #### builder for mac-ppc-10_4a-test ####
     ########################################
     mac_ppc_104a_test_factory = factory.BuildFactory()
--- a/build/buildbot/master/master.cfg
+++ b/build/buildbot/master/master.cfg
@@ -56,23 +56,24 @@ c = BuildmasterConfig = {}
 ####### BUILDSLAVES
 from buildbot.buildslave import BuildSlave
 c['slaves'] = [BuildSlave("asteamwin2", "asteam"),
                BuildSlave("asteamwin3", "asteam"),
                BuildSlave("asteamwin11", "asteam"),
                BuildSlave("asteamwin11-sb", "asteam"),
 
                BuildSlave("asteammac1", "asteam"),
-               BuildSlave("asteammac1-64bit", "asteam"),
                BuildSlave("asteammac1-android", "asteam"),
                BuildSlave("asteammac4", "asteam"),
                BuildSlave("asteammac6", "asteam"),
                BuildSlave("asteammac9", "asteam"),
                BuildSlave("asteammac10", "asteam"),
                BuildSlave("asteammac12", "asteam"),
+               BuildSlave("asteammac12-10_5", "asteam"),
+               BuildSlave("asteammac12-64bit", "asteam"),
                BuildSlave("tamarin-xserve", "asteam"),
                BuildSlave("tamarin-xserve2", "asteam"),
             
                BuildSlave("asteammac5-64bit", "asteam"),
 
                BuildSlave("asteamlin1", "asteam"),
                BuildSlave("asteamlin5", "asteam"),
                BuildSlave("asteambeagleboard2", "asteam"),
--- a/build/buildbot/master/sandbox.py
+++ b/build/buildbot/master/sandbox.py
@@ -243,17 +243,17 @@ class sandbox:
     sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin", upload="false"))
     sb_mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin", upload="false"))
     sb_mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin", upload="false"))
     sb_mac_intel_105_compile_factory.addStep(compile_buildcheck_local)
     sb_mac_intel_105_compile_factory.addStep(util_upload_asteam_local)
 
     sb_mac_intel_105_compile_builder = {
                 'name': "mac-intel-10.5-compile-sandbox",
-                'slavename': "asteammac1",
+                'slavename': "asteammac12-10_5",
                 'factory': sb_mac_intel_105_compile_factory,
                 'builddir': './sandbox-mac-intel-10_5-compile',
     }
 
 
     ##################################################
     #### builder for mac-intel-64-compile-sandbox ####
     ##################################################
@@ -273,17 +273,17 @@ class sandbox:
     sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin", upload="false"))
     sb_mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin", upload="false"))
     sb_mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin", upload="false"))
     sb_mac_intel_64_compile_factory.addStep(compile_buildcheck_local)
     sb_mac_intel_64_compile_factory.addStep(util_upload_asteam_local)
 
     sb_mac_intel_64_compile_builder = {
                 'name': "mac64-intel-compile-sandbox",
-                'slavename': "asteammac1-64bit",
+                'slavename': "asteammac12-64bit",
                 'factory': sb_mac_intel_64_compile_factory,
                 'builddir': './sandbox-mac64-intel-compile',
     }
 
 
     ###################################################
     #### builder for mac-ppc-10_4a-compile-sandbox ####
     ###################################################
@@ -728,33 +728,33 @@ class sandbox:
     ##################################################
     sb_mac_intel_105_smoke_factory = factory.BuildFactory()
     sb_mac_intel_105_smoke_factory.addStep(download_testmedia)
     sb_mac_intel_105_smoke_factory.addStep(test_smoke)
     sb_mac_intel_105_smoke_factory.addStep(util_process_clean)
 
     sb_mac_intel_105_smoke_builder = {
                 'name': "mac-intel-10.5-smoke-sandbox",
-                'slavename': "asteammac1",
+                'slavename': "asteammac12-10_5",
                 'factory': sb_mac_intel_105_smoke_factory,
                 'builddir': './sandbox-mac-intel-10_5-smoke',
     }
 
 
     ###############################################
     #### builder for mac64-intel-smoke-sandbox ####
     ###############################################
     sb_mac_intel_64_smoke_factory = factory.BuildFactory()
     sb_mac_intel_64_smoke_factory.addStep(download_testmedia)
     sb_mac_intel_64_smoke_factory.addStep(test_smoke)
     sb_mac_intel_64_smoke_factory.addStep(util_process_clean)
 
     sb_mac_intel_64_smoke_builder = {
                 'name': "mac64-intel-smoke-sandbox",
-                'slavename': "asteammac1-64bit",
+                'slavename': "asteammac12-64bit",
                 'factory': sb_mac_intel_64_smoke_factory,
                 'builddir': './sandbox-mac64-intel-smoke',
     }
 
     #################################################
     #### builder for mac-ppc-10_4a-smoke-sandbox ####
     #################################################
     sb_mac_ppc_104a_smoke_factory = factory.BuildFactory()
@@ -1077,17 +1077,17 @@ class sandbox:
     sb_mac_intel_105_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     sb_mac_intel_105_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     sb_mac_intel_105_test_factory.addStep(test_differential)
     sb_mac_intel_105_test_factory.addStep(util_process_clean)
     sb_mac_intel_105_test_factory.addStep(util_clean_buildsdir)
 
     sb_mac_intel_105_test_builder = {
                 'name': "mac-intel-10.5-test-sandbox",
-                'slavename': "asteammac1",
+                'slavename': "asteammac12-10_5",
                 'factory': sb_mac_intel_105_test_factory,
                 'builddir': './sandbox-mac-intel-10_5-test',
     }
 
     ##############################################
     #### builder for mac64-intel-test-sandbox ####
     ##############################################
     sb_mac_intel_64_test_factory = factory.BuildFactory()
@@ -1100,17 +1100,17 @@ class sandbox:
     sb_mac_intel_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     sb_mac_intel_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     sb_mac_intel_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     sb_mac_intel_64_test_factory.addStep(util_process_clean)
     sb_mac_intel_64_test_factory.addStep(util_clean_buildsdir)
 
     sb_mac_intel_64_test_builder = {
                 'name': "mac64-intel-test-sandbox",
-                'slavename': "asteammac1-64bit",
+                'slavename': "asteammac12-64bit",
                 'factory': sb_mac_intel_64_test_factory,
                 'builddir': './sandbox-mac64-intel-test',
     }
 
 
     ################################################
     #### builder for mac-ppc-10_4a-test-sandbox ####
     ################################################
--- a/build/buildbot/master/tamarinredux.py
+++ b/build/buildbot/master/tamarinredux.py
@@ -306,17 +306,17 @@ class tamarinredux:
     mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_105_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_105_compile_builder = {
                 'name': "mac-intel-10.5-compile",
-                'slavename': "asteammac1",
+                'slavename': "asteammac12-10_5",
                 'factory': mac_intel_105_compile_factory,
                 'builddir': './mac-intel-10_5-compile',
     }
 
 
     ##########################################
     #### builder for mac-intel-64-compile ####
     ##########################################
@@ -336,17 +336,17 @@ class tamarinredux:
     mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_64_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_64_compile_builder = {
                 'name': "mac64-intel-compile",
-                'slavename': "asteammac1-64bit",
+                'slavename': "asteammac12-64bit",
                 'factory': mac_intel_64_compile_factory,
                 'builddir': './mac64-intel-compile',
     }
 
 
     ############################################
     #### builder for mac-ppc-10_4a-compile ####
     ############################################
@@ -843,33 +843,33 @@ class tamarinredux:
     ##########################################
     mac_intel_105_smoke_factory = factory.BuildFactory()
     mac_intel_105_smoke_factory.addStep(download_testmedia)
     mac_intel_105_smoke_factory.addStep(test_smoke)
     mac_intel_105_smoke_factory.addStep(util_process_clean)
 
     mac_intel_105_smoke_builder = {
                 'name': "mac-intel-10.5-smoke",
-                'slavename': "asteammac1",
+                'slavename': "asteammac12-10_5",
                 'factory': mac_intel_105_smoke_factory,
                 'builddir': './mac-intel-10_5-smoke',
     }
 
 
     #######################################
     #### builder for mac64-intel-smoke ####
     #######################################
     mac_intel_64_smoke_factory = factory.BuildFactory()
     mac_intel_64_smoke_factory.addStep(download_testmedia)
     mac_intel_64_smoke_factory.addStep(test_smoke)
     mac_intel_64_smoke_factory.addStep(util_process_clean)
 
     mac_intel_64_smoke_builder = {
                 'name': "mac64-intel-smoke",
-                'slavename': "asteammac1-64bit",
+                'slavename': "asteammac12-64bit",
                 'factory': mac_intel_64_smoke_factory,
                 'builddir': './mac64-intel-smoke',
     }
 
     #########################################
     #### builder for mac-ppc-10_4a-smoke ####
     #########################################
     mac_ppc_104a_smoke_factory = factory.BuildFactory()
@@ -1219,17 +1219,17 @@ class tamarinredux:
     mac_intel_105_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     mac_intel_105_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     mac_intel_105_test_factory.addStep(test_differential)
     mac_intel_105_test_factory.addStep(util_process_clean)
     mac_intel_105_test_factory.addStep(util_clean_buildsdir)
 
     mac_intel_105_test_builder = {
                 'name': "mac-intel-10.5-test",
-                'slavename': "asteammac1",
+                'slavename': "asteammac12-10_5",
                 'factory': mac_intel_105_test_factory,
                 'builddir': './mac-intel-10_5-test',
     }
 
 
     ######################################
     #### builder for mac64-intel-test ####
     ######################################
@@ -1243,17 +1243,17 @@ class tamarinredux:
     mac_intel_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(util_process_clean)
     mac_intel_64_test_factory.addStep(util_clean_buildsdir)
 
     mac_intel_64_test_builder = {
                 'name': "mac64-intel-test",
-                'slavename': "asteammac1-64bit",
+                'slavename': "asteammac12-64bit",
                 'factory': mac_intel_64_test_factory,
                 'builddir': './mac64-intel-test',
     }
 
     ########################################
     #### builder for mac-ppc-10_4a-test ####
     ########################################
     mac_ppc_104a_test_factory = factory.BuildFactory()
--- a/build/buildbot/slaves/mac-intel-10_5/buildbot.tac
+++ b/build/buildbot/slaves/mac-intel-10_5/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac-intel-10_5'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac1'
+slavename = 'asteammac12-10_5'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac64-intel/buildbot.tac
+++ b/build/buildbot/slaves/mac64-intel/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac64-intel'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac1-64bit'
+slavename = 'asteammac12-64bit'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)