Bug 1631243 - Use the current run-task arguments for gecko checkout and sparse profile, r=tomprince
authorNick Thomas <nthomas@mozilla.com>
Mon, 20 Apr 2020 03:26:39 +0000
changeset 214 ab1d110d850a29d70e0a1a8688b95daea743ae74
parent 213 ec62d2df61eeb3b4297deafbf8e314bc17e98d1d
child 215 4d4a7253cf93679626f608aac8ecf66b1cf477d3
push id154
push usernthomas@mozilla.com
push dateMon, 20 Apr 2020 03:31:52 +0000
treeherderci-admin@ab1d110d850a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince
bugs1631243
Bug 1631243 - Use the current run-task arguments for gecko checkout and sparse profile, r=tomprince Differential Revision: https://phabricator.services.mozilla.com/D71496
src/ciadmin/generate/cron_tasks.py
--- a/src/ciadmin/generate/cron_tasks.py
+++ b/src/ciadmin/generate/cron_tasks.py
@@ -28,33 +28,33 @@ async def _make_gecko_context(project, e
         # There is no `parent_repo` for this project,
         # so it is itself a regular gecko source repo
         context = {
             "repo_env": {
                 "GECKO_BASE_REPOSITORY": "https://hg.mozilla.org/mozilla-unified",
                 "GECKO_HEAD_REPOSITORY": project.repo,
                 "GECKO_HEAD_REF": "default",
             },
-            "checkout_options": ["--vcs-checkout=/builds/worker/checkouts/gecko"],
+            "checkout_options": ["--gecko-checkout=/builds/worker/checkouts/gecko"],
             "cron_options": "",
         }
     else:
         # This project's configuration points to a separate parent_repo,
         # and should be checked out as a subdirectory of that repo
         context = {
             "repo_env": {
                 "GECKO_BASE_REPOSITORY": "https://hg.mozilla.org/mozilla-unified",
                 "GECKO_HEAD_REPOSITORY": project.parent_repo,
                 "GECKO_HEAD_REF": "default",
                 "COMM_BASE_REPOSITORY": "https://hg.mozilla.org/comm-central",
                 "COMM_HEAD_REPOSITORY": project.repo,
                 "COMM_HEAD_REF": "default",
             },
             "checkout_options": [
-                "--vcs-checkout=/builds/worker/checkouts/gecko",
+                "--gecko-checkout=/builds/worker/checkouts/gecko",
                 "--comm-checkout=/builds/worker/checkouts/gecko/comm",
             ],
             "cron_options": "--root=comm/",
         }
 
     context["cron_notify_emails"] = project.cron.get(
         "notify_emails", cron_gecko_config.get("notify_emails", [])
     )
@@ -69,17 +69,17 @@ async def _make_taskgraph_context(projec
     task_template = await get_ciconfig_file("taskgraph-cron-task-template.yml")
     cron_taskgraph_config = environment.cron.get("taskgraph", {})
     context = {
         "repo_env": {
             "VCS_HEAD_REPOSITORY": project.repo,
             "VCS_HEAD_REF": "default" if project.repo_type == "hg" else "master",
             "VCS_REPOSITORY_TYPE": project.repo_type,
         },
-        "checkout_options": ["--vcs-checkout=/builds/worker/checkouts/src"],
+        "checkout_options": ["--gecko-checkout=/builds/worker/checkouts/src"],
         "cron_options": "",
         "cron_notify_emails": project.cron.get(
             "notify_emails", cron_taskgraph_config.get("notify_emails", [])
         ),
         "hooks_owner": project.cron.get(
             "hooks_owner", cron_taskgraph_config.get("hooks_owner", "")
         ),
     }