Bug 812512. remove 10.5 (Leopard) code. r=coop

mozilla · Feb 20, 2013 · b938c33 · b938c33
1 parent 5466bea
commit b938c33
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/buildfarm/maintenance/production-masters.json b/buildfarm/maintenance/production-masters.json
@@ -17,12 +17,10 @@
     "hostname": "buildbot-master04.build.scl1.mozilla.com",
     "http_port": 8201,
     "limit_fx_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_mobile_platforms": [],
     "limit_tb_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_b2g_platforms": [],
@@ -52,12 +50,10 @@
     "hostname": "buildbot-master06.build.scl1.mozilla.com",
     "http_port": 8201,
     "limit_fx_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_mobile_platforms": [],
     "limit_tb_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_b2g_platforms": [],
@@ -138,12 +134,10 @@
     "hostname": "buildbot-master11.build.scl1.mozilla.com",
     "http_port": 8201,
     "limit_fx_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_mobile_platforms": [],
     "limit_tb_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_b2g_platforms": [],
@@ -460,12 +454,10 @@
     "hostname": "buildbot-master21.build.scl1.mozilla.com",
     "http_port": 8201,
     "limit_fx_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_mobile_platforms": [],
     "limit_tb_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_b2g_platforms": [],
@@ -880,12 +872,10 @@
     "hostname": "buildbot-master37.srv.releng.scl3.mozilla.com",
     "http_port": 8201,
     "limit_fx_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_mobile_platforms": [],
     "limit_tb_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_b2g_platforms": [],
@@ -915,12 +905,10 @@
     "hostname": "buildbot-master38.srv.releng.scl3.mozilla.com",
     "http_port": 8201,
     "limit_fx_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_mobile_platforms": [],
     "limit_tb_platforms": [
-        "macosx",
         "macosx64"
     ],
     "limit_b2g_platforms": [],

diff --git a/buildfarm/maintenance/update_remote_creds.pl b/buildfarm/maintenance/update_remote_creds.pl
@@ -127,7 +127,6 @@ ($$$)
 	$line =~ /mac[^h]/i or
 	$line =~ /darwin/i or
 	$line =~ /tiger/i or
-	$line =~ /leopard/i or
 	$line =~ /snow/i or
 	$line =~ /osx/i) {
       $machine_list->{$line}->{'platform'} = 'mac';

diff --git a/buildfarm/utils/run_jetpack.py b/buildfarm/utils/run_jetpack.py
@@ -20,7 +20,6 @@
 SDK_DIR = "jetpack"
 
 PLATFORMS = {
-    'leopard': 'macosx64',
     'snowleopard': 'macosx64',
     'lion': 'macosx64',
     'mountainlion': 'macosx64',
@@ -149,11 +148,7 @@ def summarizeJetpackTestLog(name, log):
         os.chdir(POLLER_DIR)
         basepath = os.getcwd()
         sdk_url = options.tarball_url
-        # need this as long as we support 32bit macosx debug builds
-        if options.platform == 'leopard' and options.ftp_url.endswith('debug'):
-            platform = 'macosx'
-        else:
-            platform = PLATFORMS[options.platform]
+        platform = PLATFORMS[options.platform]
         branch = options.branch
         ftp_url = options.ftp_url % locals()
         pat = re.compile('firefox.*%s$' % options.ext)
@@ -219,7 +214,7 @@ def summarizeJetpackTestLog(name, log):
                             'ubuntu32', 'ubuntu64'):
         app_path = "%s/firefox/firefox" % basepath
         poller_cmd = 'tar -xjvf *%s' % options.ext
-    elif options.platform in ('macosx', 'macosx64', 'leopard', 'snowleopard', 'lion', 'mountainlion'):
+    elif options.platform in ('macosx', 'macosx64', 'snowleopard', 'lion', 'mountainlion'):
         poller_cmd = '../scripts/buildfarm/utils/installdmg.sh *.dmg'
     elif options.platform in ('win32', 'win7', 'win64', 'win764', 'w764', 'xp'):
         app_path = "%s/firefox/firefox.exe" % basepath
@@ -255,7 +250,7 @@ def summarizeJetpackTestLog(name, log):
             print "TinderboxPrint: <a href=\"http://hg.mozilla.org/projects/addon-sdk/rev/%(sdk_rev)s\">sdk-rev:%(sdk_rev)s</a>\n" % locals()
             sdkdir = os.path.abspath(d)
             print "SDKDIR: %s" % sdkdir
-        if options.platform in ('macosx', 'macosx64', 'leopard', 'snowleopard', 'lion', 'mountainlion'):
+        if options.platform in ('macosx', 'macosx64', 'snowleopard', 'lion', 'mountainlion'):
             if '.app' in d:
                 app_path = os.path.abspath(d)
                 print "APP_PATH: %s" % app_path