shelve winmo. bug 554087, r=nthomas 20100504_TRYSERVER
authorAki Sasaki <asasaki@mozilla.com>
Wed, 24 Mar 2010 21:44:20 -0700
changeset 665 c7705d122890973bb00a8602ac66fe8930e9058c
parent 664 ab0eb581b33fd754aa3f8e66dd17ab7514ec43d3
child 666 5b165130854b239763594881951893d19db4135b
push id396
push userasasaki@mozilla.com
push dateThu, 25 Mar 2010 04:44:48 +0000
reviewersnthomas
bugs554087
shelve winmo. bug 554087, r=nthomas
env.py
process/factory.py
process/tryserverfactory.py
status/generators.py
--- a/env.py
+++ b/env.py
@@ -108,78 +108,16 @@ MozillaEnvironments['win32-unittest'] = 
     "FrameworkVersion": 'v2.0.50727',
     "FrameworkSDKDir": 'D:\\msvs8\\SDK\\v2.0',
     "MSVCDir": 'D:\\msvs8\\VC',
     "DevEnvDir": "D:\\msvs8\\Common7\\IDE",
     "LIBPATH": 'C:\\WINDOWS\\Microsoft.NET\\Framework\\v2.0.50727;' + \
                'D:\\msvs8\\VC\\ATLMFC\\LIB'
 }
 
-MozillaEnvironments['winmo-arm'] = {
-    "DEVENVDIR": 'd:\\msvs9\\Common7\\IDE',
-    "FRAMEWORK35VERSION": 'v3.5',
-    "FRAMEWORKDIR": 'C:\\WINDOWS\\Microsoft.NET\\Framework',
-    "FRAMEWORKVERSION": 'v2.0.50727',
-    "INCLUDE": 'd:\\msvs9\\VC\\ATLMFC\\INCLUDE;' + \
-               'd:\\msvs9\\VC\\INCLUDE;' + \
-               'C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\include;',
-    "LIB": 'd:\\msvs9\\VC\\ATLMFC\\LIB;' + \
-           'd:\\msvs9\\VC\\LIB;C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\lib;',
-    "LIBPATH": 'C:\\WINDOWS\\Microsoft.NET\\Framework\\v3.5;' + \
-               'C:\\WINDOWS\\Microsoft.NET\\Framework\\v2.0.50727;' + \
-               'd:\\msvs9\\VC\\ATLMFC\\LIB;d:\\msvs9\\VC\\LIB;',
-    "MOZILLABUILD": 'D:\\mozilla-build\\',
-    "MOZILLABUILDDRIVE": 'D:',
-    "MOZILLABUILDPATH": '\\mozilla-build\\',
-    "MOZ_MSVCVERSION": '9',
-    "MOZ_NO_RESET_PATH": '1',
-    "MOZ_TOOLS": 'D:\\mozilla-build\\moztools',
-    "NVAPSDK": 'd:\sdks\tegra042',
-    "PATH": 'D:\\mozilla-build\\msys\\local\\bin;' + \
-            'd:\\mozilla-build\\wget;' + \
-            'd:\\mozilla-build\\7zip;' + \
-            'd:\\mozilla-build\\blat261\\full;' + \
-            'd:\\mozilla-build\\python25;' + \
-            'd:\\mozilla-build\\svn-win32-1.4.2\\bin;' + \
-            'd:\\mozilla-build\\upx203w;' + \
-            'd:\\mozilla-build\\xemacs\\XEmacs-21.4.19\\i586-pc-win32;' + \
-            'd:\\mozilla-build\\info-zip;' + \
-            'd:\\mozilla-build\\nsis-2.22;' + \
-            'd:\\mozilla-build\\nsis-2.33u;' + \
-            '.;' + \
-            'D:\\mozilla-build\\msys\\local\\bin;' + \
-            'D:\\mozilla-build\\msys\\mingw\\bin;' + \
-            'D:\\mozilla-build\\msys\\bin;' + \
-            'd:\\msvs9\\Common7\\IDE;' + \
-            'd:\\msvs9\\VC\\BIN;' + \
-            'd:\\msvs9\\Common7\\Tools;' + \
-            'c:\\WINDOWS\\Microsoft.NET\\Framework\\v3.5;' + \
-            'c:\\WINDOWS\\Microsoft.NET\\Framework\\v2.0.50727;' + \
-            'd:\\msvs9\\VC\\VCPackages;' + \
-            'c:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\bin;' + \
-            'c:\\WINDOWS\\system32;' + \
-            'c:\\WINDOWS;' + \
-            'c:\\WINDOWS\\System32\\Wbem;' + \
-            'd:\\mozilla-build\\python25;' + \
-            'd:\\mozilla-build\\hg;' + \
-            'c:\\Program Files\\Microsoft SQL Server\\90\\Tools\\binn\\;' + \
-            'd:\\sdks\\tegra042\\tools;' + \
-            'd:\\sdks\\tegra042\\platformlibs\\bin\\winxp\\x86\\release;' + \
-            'd:\\sdks\\tegra042\\3rdparty\\bin\\winxp\\x86\\release;' + \
-            'd:\\mozilla-build\\moztools\\bin',
-    "SDKDIR": 'D:\\sdks\\v6.0\\',
-    "SDKVER": '6',
-    "VC8DIR": 'D:\\msvs8\\VC\\',
-    "VC9DIR": 'd:\\msvs9\\VC\\',
-    "VCINSTALLDIR": 'd:\\msvs9\\VC',
-    "VS80COMNTOOLS": 'D:\\msvs8\\Common7\\Tools\\',
-    "VS90COMNTOOLS": 'd:\\msvs9\\Common7\\Tools\\',
-    "VSINSTALLDIR": 'd:\\msvs9',
-}
-
 ### Talos environments
 # platform SDK location.  we can build both from one generic template.
 # modified from vc8 environment
 MozillaEnvironments['win32-perf'] = {
     "MOZ_CRASHREPORTER_NO_REPORT": '1',
     "MOZ_NO_REMOTE": '1',
     "NO_EM_RESTART": '1',
     "XPCOM_DEBUG_BREAK": 'warn',
--- a/process/factory.py
+++ b/process/factory.py
@@ -4887,17 +4887,17 @@ class MobileBuildFactory(MozillaBuildFac
                  stageUsername=None, stageSshKey=None, stageServer=None,
                  stageBasePath=None, stageGroup=None,
                  baseUploadDir=None, baseWorkDir='build', nightly=False,
                  clobber=False, env=None,
                  mobileRevision='default',
                  mozRevision='default', **kwargs):
         """
     mobileRepoPath: the path to the mobileRepo (mobile-browser)
-    platform: the mobile platform (linux-arm, winmo-arm)
+    platform: the mobile platform (linux-arm)
     baseWorkDir: the path to the default slave workdir
         """
         MozillaBuildFactory.__init__(self, **kwargs)
         self.configRepository = self.getRepository(configRepoPath)
         self.mobileRepository = self.getRepository(mobileRepoPath)
         self.mobileBranchName = self.getRepoName(self.mobileRepository)
         self.baseWorkDir = baseWorkDir
         self.configSubDir = configSubDir
@@ -5496,200 +5496,16 @@ class MaemoReleaseBuildFactory(MaemoBuil
             releaseToTinderboxBuilds=False,
             releaseToCandidates=True,
             tinderboxBuildsDir=self.baseUploadDir,
             remoteCandidatesPath=self.stageBasePath,
             dependToDated=True,
             workdir=self.objdirAbsPath
         )
 
-class WinmoBuildFactory(MobileBuildFactory):
-    def __init__(self,
-                 packageGlobList=['mobile/dist/*.zip',
-                                  'mobile/dist/*.exe',
-                                  'mobile/dist/*.cab',
-                                  'xulrunner/dist/*.tar.bz2'],
-                 createSnippet=False, downloadBaseURL=None,
-                 ausUser=None, ausHost=None, ausBaseUploadDir=None,
-                 objdirPath=None, updatePlatform='WINCE_arm-msvc',
-                 **kwargs):
-        MobileBuildFactory.__init__(self, **kwargs)
-        self.packageGlob = ' '.join(packageGlobList)
-        if objdirPath:
-            self.objdirPath = objdirPath
-        else:
-            self.objdirPath = '%s/%s/%s' % (self.baseWorkDir, self.branchName,
-                                            self.objdir)
-        self.createSnippet = createSnippet
-        if self.createSnippet:
-            assert downloadBaseURL and \
-                   ausUser and \
-                   ausHost and \
-                   ausBaseUploadDir and \
-                   updatePlatform
-            self.packageGlob += " mobile/dist/update/*.complete.mar"
-            self.downloadBaseURL = downloadBaseURL
-            self.ausUser = ausUser
-            self.ausHost = ausHost
-            self.ausBaseUploadDir = ausBaseUploadDir
-            self.updatePlatform = updatePlatform
-            
-            # this is a tad ugly because we need to python interpolation
-            # as well as WithProperties
-            # here's an example of what it translates to:
-            # /opt/aus2/build/0/Firefox/mozilla-central/WINNT_x86-msvc/2008010103/en-US
-            self.ausFullUploadDir = '%s/%s/%%(buildid)s/en-US' % \
-              (self.ausBaseUploadDir, self.updatePlatform)
-
-        self.addPreCleanSteps()
-        self.addBaseRepoSteps()
-        self.getMozconfig()
-        self.addPreBuildSteps()
-        self.addBuildSteps()
-        self.addPackageSteps()
-        if self.createSnippet:
-            self.addUpdateSteps()
-        self.addUploadSteps(platform='win32')
-        if self.triggerBuilds:
-            self.addTriggeredBuildsSteps()
-        if self.buildsBeforeReboot and self.buildsBeforeReboot > 0:
-            self.addPeriodicRebootSteps()
-
-    def addPreCleanSteps(self):
-        if self.clobber:
-            self.addStep(ShellCommand,
-                name='clobber_%s_dir' % self.branchName,
-                command=['rm', '-rf', self.branchName],
-                env=self.env,
-                workdir=self.baseWorkDir,
-                timeout=60*60
-            )
-        else:
-            self.addStep(ShellCommand,
-                name='remove_old_builds',
-                command = ['bash', '-c', 'rm -rf %s/mobile/dist/*.zip ' %
-                           self.objdirPath,
-                           '%s/mobile/dist/*.exe ' % self.objdirPath],
-                workdir=self.baseWorkDir,
-                description=['removing', 'old', 'builds'],
-                descriptionDone=['removed', 'old', 'builds']
-            )
-
-    def addBuildSteps(self):
-        self.addStep(ShellCommand,
-            name='compile',
-            command=['make', '-f', 'client.mk', 'build'],
-            description=['compile'],
-            workdir='%s/%s' % (self.baseWorkDir, self.branchName),
-            env=self.env,
-            haltOnFailure=True
-        )
-
-    def addPackageSteps(self):
-        self.addStep(ShellCommand,
-            name='make_pkg',
-            command=['make', 'package'],
-            workdir='%s/mobile' % self.objdirPath,
-            description=['make', 'package'],
-            haltOnFailure=True
-        )
-        self.addStep(ShellCommand,
-            name='make_installer',
-            command=['make', 'installer'],
-            workdir='%s/mobile' % self.objdirPath,
-            description=['make', 'installer'],
-            haltOnFailure=True
-        )
-        self.addStep(ShellCommand,
-            name='make_cab',
-            command=['make', 'cab'],
-            workdir='%s/mobile/mobile/installer' % self.objdirPath,
-            description=['make', 'cab'],
-            haltOnFailure=True
-        )
-        self.addStep(ShellCommand,
-            name='make_pkg_tests',
-            command=['make', 'package-tests'],
-            workdir='%s/xulrunner' % self.objdirPath,
-            description=['make', 'package-tests'],
-            haltOnFailure=True
-        )
-
-    def addUpdateSteps(self):
-        self.addStep(ShellCommand,
-            name='make_update_pkg',
-            command=['make', '-C', 'tools/update-packaging'],
-            workdir='%s/mobile' % self.objdirPath,
-            description=['make', 'update', 'pkg'],
-            haltOnFailure=True
-        )
-        self.addFilePropertiesSteps(filename='*.complete.mar',
-                                    directory='%s/mobile/dist/update' % \
-                                      self.objdirPath,
-                                    fileType='completeMar',
-                                    haltOnFailure=True)
-        self.addStep(SetProperty,
-            name="get_buildid",
-            command=['python', 'config/printconfigsetting.py',
-                     '%s/mobile/dist/bin/application.ini' % self.objdir,
-                     'App', 'BuildID'],
-            property='buildid',
-            workdir='%s/%s' % (self.baseWorkDir, self.branchName),
-            description=['getting', 'buildid'],
-            descriptionDone=['got', 'buildid']
-        )
-        self.addStep(SetProperty(
-            name="get_app_version",
-            command=['python', 'config/printconfigsetting.py',
-                     '%s/mobile/dist/bin/application.ini' % self.objdir,
-                     'App', 'Version'],
-            property='appVersion',
-            workdir='%s/%s' % (self.baseWorkDir, self.branchName),
-            description=['getting', 'app', 'version'],
-            descriptionDone=['got', 'app', 'version']
-        ))
-        self.addStep(CreateCompleteUpdateSnippet(
-            name='create_complete_update_snippet',
-            objdir=self.objdirPath,
-            milestone=self.baseUploadDir,
-            baseurl='%s/nightly' % self.downloadBaseURL,
-            hashType=self.hashType)
-        )
-        self.addStep(ShellCommand,
-            name='cat_complete_snippet',
-            description=['cat','complete','snippet'],
-            command=['cat','complete.update.snippet'],
-            workdir='%s/dist/update' % self.objdirPath,
-        )
-
-    def addUploadSteps(self, platform='win32'):
-        MobileBuildFactory.addUploadSteps(self,platform=platform)
-        # ausFullUploadDir contains an interpolation of the buildid property.
-        # We expect the property to be set by the parent call to
-        # addUploadSteps()
-        if self.createSnippet:
-            self.addStep(ShellCommand,
-                name='create_aus_updir',
-                command=['ssh', '-l', self.ausUser, self.ausHost,
-                         WithProperties('mkdir -p %s' % self.ausFullUploadDir)],
-                description=['create', 'aus', 'upload', 'dir'],
-                haltOnFailure=True
-            )
-            self.addStep(ShellCommand,
-                name='upload_complete_snippet',
-                command=['scp', '-o', 'User=%s' % self.ausUser,
-                         'dist/update/complete.update.snippet',
-                         WithProperties("%s:'%s/complete.txt'" % \
-                           (self.ausHost, self.ausFullUploadDir))],
-                workdir=self.objdirPath,
-                description=['upload', 'complete', 'snippet'],
-                haltOnFailure=True
-            )
-
-
 class UnittestPackagedBuildFactory(MozillaBuildFactory):
     def __init__(self, platform, test_suites, env={}, productName='firefox',
             mochitest_leak_threshold=None, crashtest_leak_threshold=None,
             totalChunks=None, thisChunk=None, chunkByDir=None, downloadSymbols=True,
             **kwargs):
         self.platform = platform.split('-')[0]
 
         self.env = MozillaEnvironments['%s-unittest' % self.platform].copy()
--- a/process/tryserverfactory.py
+++ b/process/tryserverfactory.py
@@ -9,17 +9,17 @@ from buildbot.steps.shell import SetProp
 import buildbotcustom.process.factory
 import buildbotcustom.steps.misc
 import buildbotcustom.steps.tryserver
 reload(buildbotcustom.process.factory)
 reload(buildbotcustom.steps.misc)
 reload(buildbotcustom.steps.tryserver)
 
 from buildbotcustom.process.factory import MercurialBuildFactory, \
-  WinmoBuildFactory, MaemoBuildFactory
+  MaemoBuildFactory
 from buildbotcustom.steps.misc import SendChangeStep
 from buildbotcustom.steps.tryserver import MozillaTryProcessing, \
   MozillaDownloadMozconfig, MozillaPatchDownload, MozillaTryServerHgClone, \
   MozillaCustomPatch, MozillaCreateUploadDirectory, MozillaUploadTryBuild
 
 
 class TryBuildFactory(MercurialBuildFactory):
     def __init__(self, platform, configRepoPath=None, configSubDir=None,
@@ -249,114 +249,8 @@ class MaemoTryBuildFactory(MaemoBuildFac
             description=['create', 'upload', 'directory'],
             haltOnFailure=True,
             workdir=self.baseWorkDir)
         self.addStep(ShellCommand,
             command="cp %s %s/%s" % (self.packageGlob,
                                      self.baseWorkDir, self.slavesrcdir),
             description=['move', 'globs', 'to', 'upload', 'directory'],
             workdir=self.objdirAbsPath)
-
-
-class WinmoTryBuildFactory(WinmoBuildFactory):
-    def __init__(self, scp_string=None, targetSubDir='winmo',
-                 slavesrcdir='upload', baseWorkDir=None, objdir=None,
-                 **kwargs):
-        assert(baseWorkDir, objdir)
-        self.scp_string = scp_string
-        self.targetSubDir=targetSubDir
-        self.slavesrcdir=slavesrcdir
-        WinmoBuildFactory.__init__(self,
-                                   objdirPath='%s/%s' % (baseWorkDir, objdir),
-                                   baseWorkDir=baseWorkDir, objdir=objdir,
-                                   **kwargs)
-
-    def getMozconfig(self):
-        self.addStep(MozillaDownloadMozconfig, mastersrc="mozconfig-winmo",
-                                               patchDir="patches/",
-                                               workdir=self.baseWorkDir)
-
-    def addPreCleanSteps(self):
-        self.addStep(MozillaTryProcessing)
-        self.addStep(ShellCommand,
-            name="pacify rmdir",
-            description="Pacify rmdir",
-            descriptionDone="Pacified rmdir",
-            command=["bash", "-c",
-                     "if [ ! -d %(base)s ]; then mkdir -v %(base)s; fi" %
-                        {'base': self.baseWorkDir}],
-            workdir="."
-        )
-        self.addStep(ShellCommand,
-            name="remove source and obj dirs",
-            command=["rmdir", "/s", "/q", "%s" % self.baseWorkDir],
-            haltOnFailure=True,
-            flunkOnFailure=True,
-            workdir=".",
-            timeout=60*60, # 1 hour
-        )
-        
-    def addBaseRepoSteps(self):
-        self.addStep(MozillaTryServerHgClone, workdir=self.baseWorkDir)
-        self.addHgPullSteps(repository=self.mobileRepository,
-                            workdir=self.baseWorkDir,
-                            changesetLink=self.mobileChangesetLink,
-                            targetDirectory='mobile')
-
-    def addPreBuildSteps(self):
-        self.addStep(MozillaPatchDownload,
-            patchDir="patches/",
-            haltOnFailure=False,
-            flunkOnFailure=True,
-            workdir=self.baseWorkDir,
-            isOptional=True,
-        )
-        self.addStep(MozillaCustomPatch,
-            workdir=self.baseWorkDir,
-            haltOnFailure=True,
-            flunkOnFailure=True,
-            isOptional=True
-        )
-        self.addStep(ShellCommand,
-            name="mozconfig contents",
-            command=["cat", ".mozconfig"],
-            workdir=self.baseWorkDir,
-            description=["mozconfig", "contents"]
-        )
-
-    def addBuildSteps(self):
-        self.addStep(ShellCommand,
-            command=['make', '-f', 'client.mk', 'build'],
-            description=['compile'],
-            workdir=self.baseWorkDir,
-            env=self.env,
-            haltOnFailure=True
-        )
-        
-    def addUploadSteps(self, platform=None):
-        self.addStep(MozillaCreateUploadDirectory,
-            scpString=self.scp_string,
-            haltOnFailure=False,
-            flunkOnFailure=False,
-            targetSubDir=self.targetSubDir,
-            workdir='.'
-        )
-        
-        self.addStep(MozillaUploadTryBuild,
-            slavedir=self.baseWorkDir,
-            baseFilename="",
-            slavesrcdir=r"%s/*" % self.slavesrcdir,
-            scpString=self.scp_string,
-            targetSubDir=self.targetSubDir,
-            haltOnFailure=False,
-            flunkOnFailure=False,
-        )
-    def addPackageSteps(self):
-        WinmoBuildFactory.addPackageSteps(self)
-        self.addStep(ShellCommand,
-            command='mkdir upload',
-            description=['create', 'upload', 'directory'],
-            haltOnFailure=True,
-            workdir=self.baseWorkDir)
-        self.addStep(ShellCommand,
-            command="cp %s ../%s" % (self.packageGlob, self.slavesrcdir),
-            description=['copy', 'globs', 'to', 'upload', 'directory'],
-            workdir=self.objdirPath)
--- a/status/generators.py
+++ b/status/generators.py
@@ -18,18 +18,16 @@ def buildTryCompleteMessage(attrs, packa
         who = 'unknown'
 
     if 'Linux' in builder:
         platform = 'linux'
     elif 'OS X' in builder:
         platform = 'mac'
     elif 'WINNT' in builder:
         platform = 'win32'
-    elif 'WinMo' in builder:
-        platform = 'winmo'
     elif 'Maemo' in builder:
         platform = 'maemo'
 
     if 'unit test' in builder:
         task = 'unit test'
     elif 'talos' in builder:
         task = 'talos'
     else: