forked from mirrors/gecko-dev
		
	Bug 1850423 - Decomission esr102 from taskgraph, build toolchains and WPT, r=gbrown,jcristau,taskgraph-reviewers,releng-reviewers,jgraham
Differential Revision: https://phabricator.services.mozilla.com/D186993
This commit is contained in:
		
							parent
							
								
									4931114672
								
							
						
					
					
						commit
						8c2bcdc84b
					
				
					 15 changed files with 3 additions and 72 deletions
				
			
		|  | @ -131,7 +131,6 @@ jobs: | ||||||
|       run-on-projects: |       run-on-projects: | ||||||
|           - mozilla-beta |           - mozilla-beta | ||||||
|           - mozilla-release |           - mozilla-release | ||||||
|           - mozilla-esr102 |  | ||||||
|           - mozilla-esr115 |           - mozilla-esr115 | ||||||
|           - elm |           - elm | ||||||
|       # For all non m-c jobs we just run once daily matching the 10 UTC |       # For all non m-c jobs we just run once daily matching the 10 UTC | ||||||
|  | @ -231,7 +230,6 @@ jobs: | ||||||
|           - mozilla-central |           - mozilla-central | ||||||
|           - mozilla-beta |           - mozilla-beta | ||||||
|           - mozilla-release |           - mozilla-release | ||||||
|           - mozilla-esr102 |  | ||||||
|           - mozilla-esr115 |           - mozilla-esr115 | ||||||
|       when: |       when: | ||||||
|           - {weekday: 'Monday', hour: 8, minute: 0} |           - {weekday: 'Monday', hour: 8, minute: 0} | ||||||
|  |  | ||||||
|  | @ -100,7 +100,6 @@ class ArtifactJob(object): | ||||||
|     ] |     ] | ||||||
|     # The list below list should be updated when we have new ESRs. |     # The list below list should be updated when we have new ESRs. | ||||||
|     esr_candidate_trees = [ |     esr_candidate_trees = [ | ||||||
|         "releases/mozilla-esr102", |  | ||||||
|         "releases/mozilla-esr115", |         "releases/mozilla-esr115", | ||||||
|     ] |     ] | ||||||
|     try_tree = "try" |     try_tree = "try" | ||||||
|  | @ -842,7 +841,6 @@ class ThunderbirdMixin(object): | ||||||
|     ] |     ] | ||||||
|     # The list below list should be updated when we have new ESRs. |     # The list below list should be updated when we have new ESRs. | ||||||
|     esr_candidate_trees = [ |     esr_candidate_trees = [ | ||||||
|         "releases/comm-esr102", |  | ||||||
|         "releases/comm-esr115", |         "releases/comm-esr115", | ||||||
|     ] |     ] | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -500,7 +500,6 @@ linux/opt: | ||||||
|     run-on-projects: |     run-on-projects: | ||||||
|         - 'mozilla-beta' |         - 'mozilla-beta' | ||||||
|         - 'mozilla-release' |         - 'mozilla-release' | ||||||
|         - 'mozilla-esr102' |  | ||||||
|         - 'mozilla-esr115' |         - 'mozilla-esr115' | ||||||
|     use-sccache: true |     use-sccache: true | ||||||
|     fetches: |     fetches: | ||||||
|  |  | ||||||
|  | @ -34,7 +34,6 @@ win32-mingwclang/opt: | ||||||
|         mozconfig-variant: mingwclang |         mozconfig-variant: mingwclang | ||||||
|     run-on-projects: |     run-on-projects: | ||||||
|         - 'mozilla-central' |         - 'mozilla-central' | ||||||
|         - 'mozilla-esr102' |  | ||||||
|         - 'mozilla-esr115' |         - 'mozilla-esr115' | ||||||
|     use-sccache: true |     use-sccache: true | ||||||
|     fetches: |     fetches: | ||||||
|  | @ -74,7 +73,6 @@ win32-mingwclang/debug: | ||||||
|         mozconfig-variant: mingwclang-debug |         mozconfig-variant: mingwclang-debug | ||||||
|     run-on-projects: |     run-on-projects: | ||||||
|         - 'mozilla-central' |         - 'mozilla-central' | ||||||
|         - 'mozilla-esr102' |  | ||||||
|         - 'mozilla-esr115' |         - 'mozilla-esr115' | ||||||
|     use-sccache: true |     use-sccache: true | ||||||
|     fetches: |     fetches: | ||||||
|  | @ -114,7 +112,6 @@ win64-mingwclang/opt: | ||||||
|         mozconfig-variant: mingwclang |         mozconfig-variant: mingwclang | ||||||
|     run-on-projects: |     run-on-projects: | ||||||
|         - 'mozilla-central' |         - 'mozilla-central' | ||||||
|         - 'mozilla-esr102' |  | ||||||
|         - 'mozilla-esr115' |         - 'mozilla-esr115' | ||||||
|     use-sccache: true |     use-sccache: true | ||||||
|     fetches: |     fetches: | ||||||
|  | @ -154,7 +151,6 @@ win64-mingwclang/debug: | ||||||
|         mozconfig-variant: mingwclang-debug |         mozconfig-variant: mingwclang-debug | ||||||
|     run-on-projects: |     run-on-projects: | ||||||
|         - 'mozilla-central' |         - 'mozilla-central' | ||||||
|         - 'mozilla-esr102' |  | ||||||
|         - 'mozilla-esr115' |         - 'mozilla-esr115' | ||||||
|     use-sccache: true |     use-sccache: true | ||||||
|     fetches: |     fetches: | ||||||
|  |  | ||||||
|  | @ -408,19 +408,6 @@ merge-automation: | ||||||
|             end-tag: 'FIREFOX_NIGHTLY_{major_version}_END' |             end-tag: 'FIREFOX_NIGHTLY_{major_version}_END' | ||||||
|             to-repo: 'https://hg.mozilla.org/mozilla-central' |             to-repo: 'https://hg.mozilla.org/mozilla-central' | ||||||
|             to-branch: 'central' |             to-branch: 'central' | ||||||
|         bump-esr102: |  | ||||||
|             fetch-version-from: "browser/config/version.txt" |  | ||||||
|             version-files: |  | ||||||
|                 - filename: "config/milestone.txt" |  | ||||||
|                   version-bump: "minor" |  | ||||||
|                 - filename: "browser/config/version.txt" |  | ||||||
|                   version-bump: "minor" |  | ||||||
|                 - filename: "browser/config/version_display.txt" |  | ||||||
|                   version-bump: "minor" |  | ||||||
|             replacements: [] |  | ||||||
|             merge-old-head: false |  | ||||||
|             to-repo: 'https://hg.mozilla.org/releases/mozilla-esr102' |  | ||||||
|             to-branch: 'esr102' |  | ||||||
|         bump-esr115: |         bump-esr115: | ||||||
|             fetch-version-from: "browser/config/version.txt" |             fetch-version-from: "browser/config/version.txt" | ||||||
|             version-files: |             version-files: | ||||||
|  |  | ||||||
|  | @ -34,14 +34,12 @@ jobs: | ||||||
|                         by-release-type: |                         by-release-type: | ||||||
|                             beta: [32] |                             beta: [32] | ||||||
|                             release: [145] |                             release: [145] | ||||||
|                             esr102: [17770] |  | ||||||
|                             esr115: [17824] |                             esr115: [17824] | ||||||
|                             default: [] |                             default: [] | ||||||
|                     staging: |                     staging: | ||||||
|                         by-release-type: |                         by-release-type: | ||||||
|                             beta: [32] |                             beta: [32] | ||||||
|                             release: [145] |                             release: [145] | ||||||
|                             esr102: [902] |  | ||||||
|                             esr115: [909] |                             esr115: [909] | ||||||
|                             default: [] |                             default: [] | ||||||
|             background-rate: |             background-rate: | ||||||
|  |  | ||||||
|  | @ -46,7 +46,6 @@ jobs: | ||||||
|                 by-release-type: |                 by-release-type: | ||||||
|                     beta: ["firefox-beta-cdntest", "firefox-beta-localtest"] |                     beta: ["firefox-beta-cdntest", "firefox-beta-localtest"] | ||||||
|                     release(-rc)?: ["firefox-release-cdntest", "firefox-release-localtest"] |                     release(-rc)?: ["firefox-release-cdntest", "firefox-release-localtest"] | ||||||
|                     esr102: ["firefox-esr102-cdntest", "firefox-esr102-localtest"] |  | ||||||
|                     esr115: ["firefox-esr115-cdntest", "firefox-esr115-localtest"] |                     esr115: ["firefox-esr115-cdntest", "firefox-esr115-localtest"] | ||||||
|                     default: [] |                     default: [] | ||||||
|             pin-channels: |             pin-channels: | ||||||
|  |  | ||||||
|  | @ -45,7 +45,7 @@ Project names are the repositories.  They can be: | ||||||
| * `mozilla-central` | * `mozilla-central` | ||||||
| * `mozilla-beta` | * `mozilla-beta` | ||||||
| * `mozilla-release` | * `mozilla-release` | ||||||
| * `mozilla-esr102` | * `mozilla-esr115` | ||||||
| * ... A partial list can be found in taskcluster/gecko_taskgraph/util/attributes.py | * ... A partial list can be found in taskcluster/gecko_taskgraph/util/attributes.py | ||||||
| 
 | 
 | ||||||
| For try, this attribute applies only if ``-p all`` is specified.  All jobs can | For try, this attribute applies only if ``-p all`` is specified.  All jobs can | ||||||
|  |  | ||||||
|  | @ -197,7 +197,7 @@ Release Promotion | ||||||
|    Specify the next version for version bump tasks. |    Specify the next version for version bump tasks. | ||||||
| 
 | 
 | ||||||
| ``release_type`` | ``release_type`` | ||||||
|    The type of release being promoted. One of "nightly", "beta", "esr102", "esr115", "release-rc", or "release". |    The type of release being promoted. One of "nightly", "beta", "esr115", "release-rc", or "release". | ||||||
| 
 | 
 | ||||||
| ``release_eta`` | ``release_eta`` | ||||||
|    The time and date when a release is scheduled to live. This value is passed to Balrog. |    The time and date when a release is scheduled to live. This value is passed to Balrog. | ||||||
|  |  | ||||||
|  | @ -92,10 +92,6 @@ PER_PROJECT_PARAMETERS = { | ||||||
|         "target_tasks_method": "mozilla_release_tasks", |         "target_tasks_method": "mozilla_release_tasks", | ||||||
|         "release_type": "release", |         "release_type": "release", | ||||||
|     }, |     }, | ||||||
|     "mozilla-esr102": { |  | ||||||
|         "target_tasks_method": "mozilla_esr102_tasks", |  | ||||||
|         "release_type": "esr102", |  | ||||||
|     }, |  | ||||||
|     "mozilla-esr115": { |     "mozilla-esr115": { | ||||||
|         "target_tasks_method": "mozilla_esr115_tasks", |         "target_tasks_method": "mozilla_esr115_tasks", | ||||||
|         "release_type": "esr115", |         "release_type": "esr115", | ||||||
|  |  | ||||||
|  | @ -534,30 +534,6 @@ def target_tasks_mozilla_release(full_task_graph, parameters, graph_config): | ||||||
|     ] |     ] | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @_target_task("mozilla_esr102_tasks") |  | ||||||
| def target_tasks_mozilla_esr102(full_task_graph, parameters, graph_config): |  | ||||||
|     """Select the set of tasks required for a promotable beta or release build |  | ||||||
|     of desktop, without android CI. The candidates build process involves a pipeline |  | ||||||
|     of builds and signing, but does not include beetmover or balrog jobs.""" |  | ||||||
| 
 |  | ||||||
|     def filter(task): |  | ||||||
|         if not filter_release_tasks(task, parameters): |  | ||||||
|             return False |  | ||||||
| 
 |  | ||||||
|         if not standard_filter(task, parameters): |  | ||||||
|             return False |  | ||||||
| 
 |  | ||||||
|         platform = task.attributes.get("build_platform") |  | ||||||
| 
 |  | ||||||
|         # Android is not built on esr102. |  | ||||||
|         if platform and "android" in platform: |  | ||||||
|             return False |  | ||||||
| 
 |  | ||||||
|         return True |  | ||||||
| 
 |  | ||||||
|     return [l for l, t in full_task_graph.tasks.items() if filter(t)] |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| @_target_task("mozilla_esr115_tasks") | @_target_task("mozilla_esr115_tasks") | ||||||
| def target_tasks_mozilla_esr115(full_task_graph, parameters, graph_config): | def target_tasks_mozilla_esr115(full_task_graph, parameters, graph_config): | ||||||
|     """Select the set of tasks required for a promotable beta or release build |     """Select the set of tasks required for a promotable beta or release build | ||||||
|  | @ -1168,7 +1144,6 @@ def target_tasks_release_simulation(full_task_graph, parameters, graph_config): | ||||||
|         "nightly": "mozilla-central", |         "nightly": "mozilla-central", | ||||||
|         "beta": "mozilla-beta", |         "beta": "mozilla-beta", | ||||||
|         "release": "mozilla-release", |         "release": "mozilla-release", | ||||||
|         "esr102": "mozilla-esr102", |  | ||||||
|         "esr115": "mozilla-esr115", |         "esr115": "mozilla-esr115", | ||||||
|     } |     } | ||||||
|     target_project = project_by_release.get(parameters["release_type"]) |     target_project = project_by_release.get(parameters["release_type"]) | ||||||
|  |  | ||||||
|  | @ -27,7 +27,7 @@ INCLUDE_VERSION_REGEXES = { | ||||||
|     "nonbeta": r"'^\d+\.\d+(\.\d+)?$'", |     "nonbeta": r"'^\d+\.\d+(\.\d+)?$'", | ||||||
|     # Same as nonbeta, except for the esr suffix |     # Same as nonbeta, except for the esr suffix | ||||||
|     "esr": r"'^\d+\.\d+(\.\d+)?esr$'", |     "esr": r"'^\d+\.\d+(\.\d+)?esr$'", | ||||||
|     # Previous esr versions, for update testing before we update users to esr102 |     # Previous esr versions, for update testing before we update users to esr115 | ||||||
|     "esr115-next": r"'^(52|60|68|78|91|102)+\.\d+(\.\d+)?esr$'", |     "esr115-next": r"'^(52|60|68|78|91|102)+\.\d+(\.\d+)?esr$'", | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -15,11 +15,9 @@ RELEASE_PROJECTS = { | ||||||
|     "mozilla-central", |     "mozilla-central", | ||||||
|     "mozilla-beta", |     "mozilla-beta", | ||||||
|     "mozilla-release", |     "mozilla-release", | ||||||
|     "mozilla-esr102", |  | ||||||
|     "mozilla-esr115", |     "mozilla-esr115", | ||||||
|     "comm-central", |     "comm-central", | ||||||
|     "comm-beta", |     "comm-beta", | ||||||
|     "comm-esr102", |  | ||||||
|     "comm-esr115", |     "comm-esr115", | ||||||
|     # bug 1845368: pine is a permanent project branch used for testing |     # bug 1845368: pine is a permanent project branch used for testing | ||||||
|     # nightly updates |     # nightly updates | ||||||
|  |  | ||||||
|  | @ -61,10 +61,8 @@ SIGNING_SCOPE_ALIAS_TO_PROJECT = [ | ||||||
|         { |         { | ||||||
|             "mozilla-beta", |             "mozilla-beta", | ||||||
|             "mozilla-release", |             "mozilla-release", | ||||||
|             "mozilla-esr102", |  | ||||||
|             "mozilla-esr115", |             "mozilla-esr115", | ||||||
|             "comm-beta", |             "comm-beta", | ||||||
|             "comm-esr102", |  | ||||||
|             "comm-esr115", |             "comm-esr115", | ||||||
|         }, |         }, | ||||||
|     ], |     ], | ||||||
|  | @ -110,10 +108,8 @@ BEETMOVER_SCOPE_ALIAS_TO_PROJECT = [ | ||||||
|         { |         { | ||||||
|             "mozilla-beta", |             "mozilla-beta", | ||||||
|             "mozilla-release", |             "mozilla-release", | ||||||
|             "mozilla-esr102", |  | ||||||
|             "mozilla-esr115", |             "mozilla-esr115", | ||||||
|             "comm-beta", |             "comm-beta", | ||||||
|             "comm-esr102", |  | ||||||
|             "comm-esr115", |             "comm-esr115", | ||||||
|         }, |         }, | ||||||
|     ], |     ], | ||||||
|  | @ -188,16 +184,9 @@ BALROG_SCOPE_ALIAS_TO_PROJECT = [ | ||||||
|         "release", |         "release", | ||||||
|         { |         { | ||||||
|             "mozilla-release", |             "mozilla-release", | ||||||
|             "comm-esr102", |  | ||||||
|             "comm-esr115", |             "comm-esr115", | ||||||
|         }, |         }, | ||||||
|     ], |     ], | ||||||
|     [ |  | ||||||
|         "esr102", |  | ||||||
|         { |  | ||||||
|             "mozilla-esr102", |  | ||||||
|         }, |  | ||||||
|     ], |  | ||||||
|     [ |     [ | ||||||
|         "esr115", |         "esr115", | ||||||
|         { |         { | ||||||
|  | @ -213,7 +202,6 @@ BALROG_SERVER_SCOPES = { | ||||||
|     "aurora": "balrog:server:aurora", |     "aurora": "balrog:server:aurora", | ||||||
|     "beta": "balrog:server:beta", |     "beta": "balrog:server:beta", | ||||||
|     "release": "balrog:server:release", |     "release": "balrog:server:release", | ||||||
|     "esr102": "balrog:server:esr", |  | ||||||
|     "esr115": "balrog:server:esr", |     "esr115": "balrog:server:esr", | ||||||
|     "default": "balrog:server:dep", |     "default": "balrog:server:dep", | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -91,7 +91,6 @@ def taskcluster_url(logger, commits): | ||||||
|     repos = { |     repos = { | ||||||
|         "mozilla-central": "mozilla-central", |         "mozilla-central": "mozilla-central", | ||||||
|         "integration/autoland": "autoland", |         "integration/autoland": "autoland", | ||||||
|         "releases/mozilla-esr102": "mozilla-esr102", |  | ||||||
|         "releases/mozilla-esr115": "mozilla-esr115", |         "releases/mozilla-esr115": "mozilla-esr115", | ||||||
|     } |     } | ||||||
|     cset_url = ( |     cset_url = ( | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Andrew Halberstadt
						Andrew Halberstadt