forked from mirrors/gecko-dev
		
	Bug 1522380: [win64-aarch64] Add in-tree support for win64-aarch64 partner repacks; r=nthomas a=tomprince
Differential Revision: https://phabricator.services.mozilla.com/D17454 --HG-- extra : rebase_source : b5e19bc339564b2bb8eaa85f47029a5e0d63920d extra : amend_source : 66ba230770a61f767ba269669c645a9174665111 extra : source : ab280c1f01b46c792244ee106f146de79e93b349
This commit is contained in:
		
							parent
							
								
									b9eb46647d
								
							
						
					
					
						commit
						1795542b52
					
				
					 6 changed files with 21 additions and 2 deletions
				
			
		|  | @ -18,6 +18,7 @@ only-for-build-platforms: | ||||||
|    - macosx64-nightly/opt |    - macosx64-nightly/opt | ||||||
|    - win32-nightly/opt |    - win32-nightly/opt | ||||||
|    - win64-nightly/opt |    - win64-nightly/opt | ||||||
|  |    - win64-aarch64-nightly/opt | ||||||
| 
 | 
 | ||||||
| job-template: | job-template: | ||||||
|    shipping-phase: promote |    shipping-phase: promote | ||||||
|  |  | ||||||
|  | @ -19,3 +19,4 @@ only-for-build-platforms: | ||||||
|    - macosx64-nightly/opt |    - macosx64-nightly/opt | ||||||
|    - win32-nightly/opt |    - win32-nightly/opt | ||||||
|    - win64-nightly/opt |    - win64-nightly/opt | ||||||
|  |    - win64-aarch64-nightly/opt | ||||||
|  |  | ||||||
|  | @ -21,6 +21,7 @@ only-for-build-platforms: | ||||||
|    - macosx64-nightly/opt |    - macosx64-nightly/opt | ||||||
|    - win32-nightly/opt |    - win32-nightly/opt | ||||||
|    - win64-nightly/opt |    - win64-nightly/opt | ||||||
|  |    - win64-aarch64-nightly/opt | ||||||
| 
 | 
 | ||||||
| job-template: | job-template: | ||||||
|    mozharness: |    mozharness: | ||||||
|  |  | ||||||
|  | @ -75,3 +75,10 @@ jobs: | ||||||
|          build_type: opt |          build_type: opt | ||||||
|          artifact_prefix: releng/partner |          artifact_prefix: releng/partner | ||||||
|          nightly: true |          nightly: true | ||||||
|  | 
 | ||||||
|  |    win64-aarch64-nightly: | ||||||
|  |       attributes: | ||||||
|  |          build_platform: win64-aarch64-nightly | ||||||
|  |          build_type: opt | ||||||
|  |          artifact_prefix: releng/partner | ||||||
|  |          nightly: true | ||||||
|  |  | ||||||
|  | @ -66,10 +66,16 @@ def add_command_arguments(config, tasks): | ||||||
|                 all_locales.update(sub_partner.get('locales', [])) |                 all_locales.update(sub_partner.get('locales', [])) | ||||||
|     for task in tasks: |     for task in tasks: | ||||||
|         # add the MOZHARNESS_OPTIONS, eg version=61.0, build-number=1, platform=win64 |         # add the MOZHARNESS_OPTIONS, eg version=61.0, build-number=1, platform=win64 | ||||||
|  |         if not task['attributes']['build_platform'].endswith('-nightly'): | ||||||
|  |             raise Exception( | ||||||
|  |                 "Unexpected partner repack platform: {}".format( | ||||||
|  |                     task['attributes']['build_platform'], | ||||||
|  |                 ), | ||||||
|  |             ) | ||||||
|         task['run']['options'] = [ |         task['run']['options'] = [ | ||||||
|             'version={}'.format(release_config['version']), |             'version={}'.format(release_config['version']), | ||||||
|             'build-number={}'.format(release_config['build_number']), |             'build-number={}'.format(release_config['build_number']), | ||||||
|             'platform={}'.format(task['attributes']['build_platform'].split('-')[0]), |             'platform={}'.format(task['attributes']['build_platform'].partition('-nightly')[0]), | ||||||
|         ] |         ] | ||||||
|         if task['extra']['limit-locales']: |         if task['extra']['limit-locales']: | ||||||
|             for locale in all_locales: |             for locale in all_locales: | ||||||
|  |  | ||||||
|  | @ -126,6 +126,7 @@ TC_PLATFORM_PER_FTP = { | ||||||
|     'mac': 'macosx64-nightly', |     'mac': 'macosx64-nightly', | ||||||
|     'win32': 'win32-nightly', |     'win32': 'win32-nightly', | ||||||
|     'win64': 'win64-nightly', |     'win64': 'win64-nightly', | ||||||
|  |     'win64-aarch64': 'win64-aarch64-nightly', | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| TASKCLUSTER_PROXY_SECRET_ROOT = 'http://taskcluster/secrets/v1/secret' | TASKCLUSTER_PROXY_SECRET_ROOT = 'http://taskcluster/secrets/v1/secret' | ||||||
|  | @ -240,7 +241,7 @@ def parse_config(data): | ||||||
|             l = str(l) |             l = str(l) | ||||||
|             key, value = l.split('=', 2) |             key, value = l.split('=', 2) | ||||||
|             value = value.strip('\'"').rstrip('\'"') |             value = value.strip('\'"').rstrip('\'"') | ||||||
|             if key in ('linux-i686', 'linux-x86_64', 'mac', 'win32', 'win64'): |             if key in TC_PLATFORM_PER_FTP.keys(): | ||||||
|                 if value.lower() == 'true': |                 if value.lower() == 'true': | ||||||
|                     config['platforms'].append(TC_PLATFORM_PER_FTP[key]) |                     config['platforms'].append(TC_PLATFORM_PER_FTP[key]) | ||||||
|                 continue |                 continue | ||||||
|  | @ -367,6 +368,8 @@ def fix_partner_config(orig_config): | ||||||
| def get_ftp_platform(platform): | def get_ftp_platform(platform): | ||||||
|     if platform.startswith('win32'): |     if platform.startswith('win32'): | ||||||
|         return 'win32' |         return 'win32' | ||||||
|  |     elif platform.startswith('win64-aarch64'): | ||||||
|  |         return 'win64-aarch64' | ||||||
|     elif platform.startswith('win64'): |     elif platform.startswith('win64'): | ||||||
|         return 'win64' |         return 'win64' | ||||||
|     elif platform.startswith('macosx'): |     elif platform.startswith('macosx'): | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Tom Prince
						Tom Prince