--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -255,17 +255,17 @@ PLATFORM_VARS = {
],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/gapi.data', '/builds/gapi.data'),
('/tools/tooltool.py', '/builds/tooltool.py'),
('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
- ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
],
},
'linux64': {
'mozharness_python': '/tools/buildbot/bin/python',
'reboot_command': [
'/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt', '-n', '1', '-z'
],
@@ -364,17 +364,17 @@ PLATFORM_VARS = {
],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/gapi.data', '/builds/gapi.data'),
('/tools/tooltool.py', '/builds/tooltool.py'),
('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
- ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
],
},
'linux64-asan': {
'mozharness_python': '/tools/buildbot/bin/python',
'reboot_command': [
'/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt', '-n', '1', '-z'
],
@@ -458,17 +458,17 @@ PLATFORM_VARS = {
'freetype-devel-2.3.11-6.el6_1.8.x86_64',
],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/gapi.data', '/builds/gapi.data'),
('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
- ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
],
# The status of this build doesn't affect the last good revision
# algorithm for nightlies
'consider_for_nightly': False,
},
'linux64-asan-debug': {
'mozharness_python': '/tools/buildbot/bin/python',
'reboot_command': [
@@ -556,17 +556,17 @@ PLATFORM_VARS = {
'freetype-devel-2.3.11-6.el6_1.8.x86_64',
],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/gapi.data', '/builds/gapi.data'),
('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
- ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
],
# The status of this build doesn't affect the last good revision
# algorithm for nightlies
'consider_for_nightly': False,
},
'linux64-st-an-debug': {
'mozharness_python': '/tools/buildbot/bin/python',
'reboot_command': [
@@ -654,17 +654,17 @@ PLATFORM_VARS = {
'gstreamer-devel', 'gstreamer-plugins-base-devel',
],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/gapi.data', '/builds/gapi.data'),
('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
- ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
],
# The status of this build doesn't affect the last good revision
# algorithm for nightlies
'consider_for_nightly': False,
},
'linux64-sh-haz': {
'mozharness_config': {
'script_name': 'scripts/spidermonkey_build.py',
@@ -799,17 +799,17 @@ PLATFORM_VARS = {
],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/gapi.data', '/builds/gapi.data'),
('/tools/tooltool.py', '/builds/tooltool.py'),
('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
- ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
],
},
'macosx64': {
'mozharness_python': '/tools/buildbot/bin/python',
'reboot_command': ['scripts/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt', '-n', '1', '-z'],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
@@ -1135,17 +1135,17 @@ PLATFORM_VARS = {
'freetype-2.3.11-6.el6_1.8.x86_64',
],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/gapi.data', '/builds/gapi.data'),
('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
- ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
],
},
'linux64-debug': {
'mozharness_python': '/tools/buildbot/bin/python',
'reboot_command': [
'/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt', '-n', '1', '-z'
],
@@ -1226,17 +1226,17 @@ PLATFORM_VARS = {
'gstreamer-devel', 'gstreamer-plugins-base-devel',
],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/gapi.data', '/builds/gapi.data'),
('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
- ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
],
},
'macosx64-debug': {
'mozharness_python': '/tools/buildbot/bin/python',
'reboot_command': ['scripts/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt', '-n', '1', '-z'],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
@@ -1481,16 +1481,17 @@ PLATFORM_VARS = {
"gcc472_0moz1", "gcc473_0moz1", 'wget', 'glibc.i686',
'libstdc++.i686', 'zlib.i686',
'freetype-2.3.11-6.el6_1.8.x86_64', 'ant', 'ant-apache-regexp'],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-fennec-geoloc-api.key', '/builds/mozilla-fennec-geoloc-api.key'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
@@ -1551,16 +1552,17 @@ PLATFORM_VARS = {
"gcc472_0moz1", "gcc473_0moz1", 'wget', 'glibc.i686',
'libstdc++.i686', 'zlib.i686',
'freetype-2.3.11-6.el6_1.8.x86_64', 'ant', 'ant-apache-regexp'],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-fennec-geoloc-api.key', '/builds/mozilla-fennec-geoloc-api.key'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
@@ -1623,16 +1625,17 @@ PLATFORM_VARS = {
"gcc472_0moz1", "gcc473_0moz1", 'wget', 'glibc.i686',
'libstdc++.i686', 'zlib.i686',
'freetype-2.3.11-6.el6_1.8.x86_64', 'ant', 'ant-apache-regexp'],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-fennec-geoloc-api.key', '/builds/mozilla-fennec-geoloc-api.key'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
@@ -1693,16 +1696,17 @@ PLATFORM_VARS = {
"gcc472_0moz1", "gcc473_0moz1", 'wget', 'glibc.i686',
'libstdc++.i686', 'zlib.i686',
'freetype-2.3.11-6.el6_1.8.x86_64', 'ant', 'ant-apache-regexp'],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-fennec-geoloc-api.key', '/builds/mozilla-fennec-geoloc-api.key'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
@@ -1758,16 +1762,17 @@ PLATFORM_VARS = {
'glibc-static', 'openssh-clients', 'mpfr', 'bc',
"gcc472_0moz1", "gcc473_0moz1", 'glibc.i686', 'libstdc++.i686',
'zlib.i686', 'freetype-2.3.11-6.el6_1.8.x86_64', 'ant', 'ant-apache-regexp'],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-fennec-geoloc-api.key', '/builds/mozilla-fennec-geoloc-api.key'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
@@ -1827,16 +1832,17 @@ PLATFORM_VARS = {
'glibc-static', 'openssh-clients', 'mpfr',
'wget', 'glibc.i686', 'libstdc++.i686',
'zlib.i686', 'freetype-2.3.11-6.el6_1.8.x86_64', 'ant', 'ant-apache-regexp'],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-fennec-geoloc-api.key', '/builds/mozilla-fennec-geoloc-api.key'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
@@ -1893,16 +1899,17 @@ PLATFORM_VARS = {
'glibc-static', 'openssh-clients', 'mpfr',
'wget', 'glibc.i686', 'libstdc++.i686',
'zlib.i686', 'freetype-2.3.11-6.el6_1.8.x86_64', 'ant', 'ant-apache-regexp'],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-fennec-geoloc-api.key', '/builds/mozilla-fennec-geoloc-api.key'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
@@ -1960,16 +1967,17 @@ PLATFORM_VARS = {
'glibc-static', 'openssh-clients', 'mpfr',
'wget', 'glibc.i686', 'libstdc++.i686',
'zlib.i686', 'freetype-2.3.11-6.el6_1.8.x86_64', 'ant', 'ant-apache-regexp'],
'mock_copyin_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+ ('/builds/mozilla-fennec-geoloc-api.key', '/builds/mozilla-fennec-geoloc-api.key'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,