Bug 1175701 - Windows Puppet machines failing on sendchange, adds multi exe support, r=dustin
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -451,17 +451,18 @@ PLATFORM_VARS = {
'SYMBOL_SERVER_HOST': b2g_localconfig.SYMBOL_SERVER_HOST,
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SYMBOL_SERVER_SSH_KEY': "/c/Users/cltbld/.ssh/ffxbld_rsa",
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
'BINSCOPE': 'C:\Program Files (x86)\Microsoft\SDL BinScope\BinScope.exe',
- 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
+ # bug 1175701 - support pre and post pupppet slave buildbot exe paths
+ 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbot-0.8.4-pre-moz6\\scripts;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
'WGET_OPTS': '-q -c',
},
'enable_opt_unittests': False,
'enable_checktests': True,
'talos_masters': GLOBAL_VARS['talos_masters'],
'test_pretty_names': False,
'l10n_check_test': False,
'gaia_repo': gaia_repo,
@@ -514,17 +515,18 @@ PLATFORM_VARS = {
'SYMBOL_SERVER_HOST': b2g_localconfig.SYMBOL_SERVER_HOST,
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SYMBOL_SERVER_SSH_KEY': "/c/Users/cltbld/.ssh/ffxbld_rsa",
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
'BINSCOPE': 'C:\Program Files (x86)\Microsoft\SDL BinScope\BinScope.exe',
- 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
+ # bug 1175701 - support pre and post pupppet slave buildbot exe paths
+ 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbot-0.8.4-pre-moz6\\scripts;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
'WGET_OPTS': '-q -c',
},
'enable_opt_unittests': False,
'enable_checktests': True,
'talos_masters': GLOBAL_VARS['talos_masters'],
'test_pretty_names': False,
'l10n_check_test': False,
'gaia_repo': gaia_repo,
@@ -581,17 +583,18 @@ PLATFORM_VARS = {
'SYMBOL_SERVER_HOST': b2g_localconfig.SYMBOL_SERVER_HOST,
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SYMBOL_SERVER_SSH_KEY': "/c/Users/cltbld/.ssh/ffxbld_rsa",
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
'BINSCOPE': 'C:\Program Files (x86)\Microsoft\SDL BinScope\BinScope.exe',
- 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
+ # bug 1175701 - support pre and post pupppet slave buildbot exe paths
+ 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbot-0.8.4-pre-moz6\\scripts;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
'WGET_OPTS': '-q -c',
},
'enable_opt_unittests': False,
'enable_checktests': True,
'talos_masters': None,
'test_pretty_names': False,
'l10n_check_test': False,
'multi_locale': False,
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -945,17 +945,18 @@ PLATFORM_VARS = {
'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SYMBOL_SERVER_SSH_KEY': "/c/Users/cltbld/.ssh/ffxbld_rsa",
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
'BINSCOPE': 'C:\Program Files (x86)\Microsoft\SDL BinScope\BinScope.exe',
- 'PATH': "${MOZILLABUILD}nsis-3.0b1;${MOZILLABUILD}nsis-2.46u;${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
+ # bug 1175701 - support pre and post pupppet slave buildbot exe paths
+ 'PATH': "${MOZILLABUILD}nsis-3.0b1;${MOZILLABUILD}nsis-2.46u;${MOZILLABUILD}python27;${MOZILLABUILD}buildbot-0.8.4-pre-moz6\\scripts;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
},
'enable_checktests': True,
'talos_masters': GLOBAL_VARS['talos_masters'],
'test_pretty_names': False,
'l10n_check_test': True,
# These refer to items in passwords.secrets
# nightly_signing_servers defaults to dep-signing because we don't want
# random new branches to accidentally use nightly-signing, which signs
@@ -1020,17 +1021,18 @@ PLATFORM_VARS = {
'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SYMBOL_SERVER_SSH_KEY': "/c/Users/cltbld/.ssh/ffxbld_rsa",
'MOZ_SYMBOLS_EXTRA_BUILDID': 'win64',
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
- 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
+ # bug 1175701 - support pre and post pupppet slave buildbot exe paths
+ 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbot-0.8.4-pre-moz6\\scripts;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
},
'enable_opt_unittests': False,
'enable_checktests': True,
'talos_masters': GLOBAL_VARS['talos_masters'],
'test_pretty_names': True,
'l10n_check_test': True,
# These refer to items in passwords.secrets
# nightly_signing_servers defaults to dep-signing because we don't want
@@ -1383,17 +1385,18 @@ PLATFORM_VARS = {
'stage_product': 'firefox',
'stage_platform': 'win32-debug',
'enable_shared_checkouts': True,
'env': {
'MOZ_OBJDIR': OBJDIR,
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
'BINSCOPE': 'C:\Program Files (x86)\Microsoft\SDL BinScope\BinScope.exe',
- 'PATH': "${MOZILLABUILD}nsis-3.0b1;${MOZILLABUILD}nsis-2.46u;${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
+ # bug 1175701 - support pre and post pupppet slave buildbot exe paths
+ 'PATH': "${MOZILLABUILD}nsis-3.0b1;${MOZILLABUILD}nsis-2.46u;${MOZILLABUILD}python27;${MOZILLABUILD}buildbot-0.8.4-pre-moz6\\scripts;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
},
'enable_unittests': False,
'enable_checktests': True,
'talos_masters': None,
'nightly_signing_servers': 'dep-signing',
'dep_signing_servers': 'dep-signing',
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/releng.manifest',
'tooltool_script': ['python', '/c/mozilla-build/tooltool.py'],
@@ -1435,17 +1438,18 @@ PLATFORM_VARS = {
'stage_product': 'firefox',
'stage_platform': 'win64-debug',
'enable_shared_checkouts': True,
'env': {
'MOZ_OBJDIR': OBJDIR,
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
'BINSCOPE': 'C:\Program Files (x86)\Microsoft\SDL BinScope\BinScope.exe',
- 'PATH': "${MOZILLABUILD}nsis-3.0b1;${MOZILLABUILD}nsis-2.46u;${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
+ # bug 1175701 - support pre and post pupppet slave buildbot exe paths
+ 'PATH': "${MOZILLABUILD}nsis-3.0b1;${MOZILLABUILD}nsis-2.46u;${MOZILLABUILD}python27;${MOZILLABUILD}buildbot-0.8.4-pre-moz6\\scripts;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
},
'enable_unittests': False,
'enable_checktests': True,
'talos_masters': None,
'nightly_signing_servers': 'dep-signing',
'dep_signing_servers': 'dep-signing',
'consider_for_nightly': False,
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/releng.manifest',