Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

upload tests with en-US bits in maemo multilocale builds. bug 591548,…

… r=jhford
  • Loading branch information...
commit 9f8cd49acc9bb5a30586cfa766698e67c804b027 1 parent 4d8ff54
Aki Sasaki authored August 30, 2010

Showing 1 changed file with 8 additions and 14 deletions. Show diff stats Hide diff stats

  1. 22  process/factory.py
22  process/factory.py
@@ -5588,6 +5588,7 @@ def __init__(self, baseBuildDir, scratchboxPath="/scratchbox/moz_scratchbox",
5588 5588
         MobileBuildFactory.__init__(self, **kwargs)
5589 5589
         self.baseBuildDir = baseBuildDir
5590 5590
         self.packageGlob = ' '.join(packageGlobList)
  5591
+        self.origPackageGlob = self.packageGlob
5591 5592
         self.scratchboxPath = scratchboxPath
5592 5593
         self.multiLocale = multiLocale
5593 5594
         self.l10nRepoPath = l10nRepoPath
@@ -5627,11 +5628,6 @@ def __init__(self, baseBuildDir, scratchboxPath="/scratchbox/moz_scratchbox",
5627 5628
         self.getMozconfig()
5628 5629
         self.addPreBuildSteps()
5629 5630
         if self.multiLocale:
5630  
-            # In the multi-locale scenario we build and upload the single-locale
5631  
-            # before the multi-locale. This packageGlob will be used to move packages
5632  
-            # into the "en-US" directory before uploading it and later on the 
5633  
-            # multi-locale overwrites it in addMultiLocaleSteps(...) 
5634  
-            self.packageGlob = "dist/*.tar.* mobile/*.deb dist/deb_name.txt"
5635 5631
             self.compareLocalesRepo = self.getRepository(compareLocalesRepoPath)
5636 5632
             self.compareLocalesTag = compareLocalesTag
5637 5633
             self.addStep(ShellCommand,
@@ -5642,7 +5638,7 @@ def __init__(self, baseBuildDir, scratchboxPath="/scratchbox/moz_scratchbox",
5642 5638
             )
5643 5639
             self.addBuildSteps(extraEnv="L10NBASEDIR='../../%s'" % self.l10nRepoPath)
5644 5640
             # This will package the en-US single-locale build (no tests)
5645  
-            self.addPackageSteps()
  5641
+            self.addPackageSteps(packageTests=True)
5646 5642
             self.uploadEnUS()
5647 5643
             self.useProgress = False
5648 5644
         else: # Normal single-locale nightly like Electrolysis and Tracemonkey
@@ -5777,22 +5773,21 @@ def prepUpload(self, localeDir='en-US', uploadDir=None):
5777 5773
         # localeDir (e.g. maemo/en-US) and scp -r maemo instead of
5778 5774
         # scp -r maemo/en-US, which loses that directory structure.
5779 5775
         if not uploadDir:
5780  
-            uploadDir=localeDir
  5776
+            uploadDir = "dist/%s" % localeDir
5781 5777
         self.addStep(ShellCommand,
5782 5778
             name='prepare_upload',
5783  
-            command=['mkdir', '-p', localeDir],
  5779
+            command=['mkdir', '-p', uploadDir],
5784 5780
             haltOnFailure=True,
5785  
-            workdir='%s/dist' % (self.objdirAbsPath)
  5781
+            workdir=self.objdirAbsPath
5786 5782
         )
5787 5783
         self.addStep(ShellCommand,
5788 5784
             name='cp_binaries',
5789  
-            command=['sh', '-c', 'cp %s dist/%s' % (self.packageGlob,
5790  
-                                                       localeDir)],
  5785
+            command=['sh', '-c', 'cp %s %s' % (self.packageGlob, uploadDir)],
5791 5786
             workdir=self.objdirAbsPath,
5792 5787
         )
5793 5788
         # Now that we have moved all the packages that we want under localeDir
5794 5789
         # let's indicate that we want to upload the whole directory
5795  
-        self.packageGlob = '-r dist/%s' % uploadDir
  5790
+        self.packageGlob = '-r %s' % uploadDir
5796 5791
 
5797 5792
     def uploadEnUS(self):
5798 5793
         self.prepUpload(localeDir='en-US')
@@ -5827,8 +5822,7 @@ def addMultiLocaleSteps(self, requests=None, propertyName=None):
5827 5822
             self.addChromeLocale(locale)
5828 5823
         # Let's package the multi-locale build and upload it
5829 5824
         self.addPackageSteps(multiLocale=True, packageTests=True)
5830  
-        self.packageGlob="dist/fennec*.tar.* mobile/fennec*.deb " + \
5831  
-                         "dist/deb_name.txt dist/fennec*.zip"
  5825
+        self.packageGlob = self.origPackageGlob
5832 5826
         self.uploadMulti()
5833 5827
         if self.buildsBeforeReboot and self.buildsBeforeReboot > 0:
5834 5828
             self.addPeriodicRebootSteps()

0 notes on commit 9f8cd49

Please sign in to comment.
Something went wrong with that request. Please try again.