Bug 820238 - PuppetAgain config for new Linux64 testing reference platform. r=armenzg
authorRail Aliiev <rail@mozilla.com>
Mon, 21 Jan 2013 14:39:22 -0500
changeset 2942 88d4e6cc2057
parent 2940 4d5f49af57ab
child 2943 c65fd7add8d6
push id2297
push userraliiev@mozilla.com
push date2013-01-21 19:39 +0000
reviewersarmenzg
bugs820238
Bug 820238 - PuppetAgain config for new Linux64 testing reference platform. r=armenzg
common.py
process/factory.py
--- a/common.py
+++ b/common.py
@@ -80,16 +80,17 @@ def reallyShort(name, product=None):
         'tryserver': 'try',
         'cedar': 'ced',
         'birch': 'bir',
         'maple': 'map',
         'leopard': 'leo',
         'snowleopard': 'snow',
         'fedora': 'fed',
         'fedora64': 'fed64',
+        'ubuntu64': 'ub64',
         'repack': 'rpk',
         'alder': 'a',
         'holly': 'h',
         'larch': 'l',
         'accessibility': 'a11y',
         'inbound': 'in',
         'devtools': 'dev',
         'services': 'srv',
--- a/process/factory.py
+++ b/process/factory.py
@@ -5339,17 +5339,18 @@ class TalosFactory(RequestSortingBuildFa
         self.addCleanupSteps()
         self.addRebootStep()
 
     def pythonWithJson(self, platform):
         '''
         Return path to a python version that eithers has "simplejson" or
         it is 2.6 or higher (which includes the json module)
         '''
-        if (platform in ("fedora", "fedora64", "leopard", "snowleopard", "lion", "mountainlion")):
+        if (platform in ("fedora", "fedora64", "ubuntu64", "leopard",
+                         "snowleopard", "lion", "mountainlion")):
             return "/tools/buildbot/bin/python"
         elif (platform in ('w764', 'win7', 'xp')):
             return "C:\\mozilla-build\\python25\\python.exe"
         elif (platform.find("android") > -1):
             # path in the foopies
             return "/usr/local/bin/python2.6"
         else:
             raise ValueError("No valid platform was passed: %s" % platform)
@@ -5777,17 +5778,17 @@ class TalosFactory(RequestSortingBuildFa
                  haltOnFailure=True,
                 ))
                 self.addStep(UnpackFile(
                  filename=os.path.basename(self.plugins['32']),
                  workdir=os.path.join(self.workdirBase, "talos/base_profile"),
                  haltOnFailure=True,
                 ))
             #64 bit
-            if self.OS in ('w764', 'fedora64'):
+            if self.OS in ('w764', 'fedora64', 'ubuntu64'):
                 self.addStep(DownloadFile(
                  url=WithProperties("%s/%s" % (self.supportUrlBase, self.plugins['64'])),
                  workdir=os.path.join(self.workdirBase, "talos/base_profile"),
                  haltOnFailure=True,
                 ))
                 self.addStep(UnpackFile(
                  filename=os.path.basename(self.plugins['64']),
                  workdir=os.path.join(self.workdirBase, "talos/base_profile"),