Merge pull request mozilla-releng#698 from bhearsum/run-id

feat: expose RUN_ID and TASKCLUSTER_ROOT_URL to scriptworkers

Author: bhearsum

src/scriptworker/task.py

@@ -657,6 +657,8 @@ async def run_task(context, to_cancellable_process):
     """
     env = deepcopy(os.environ)
     env["TASK_ID"] = context.task_id or "None"
+    env["RUN_ID"] = str(get_run_id(context.claim_task))
+    env["TASKCLUSTER_ROOT_URL"] = context.config["taskcluster_root_url"]
     kwargs = {"stdout": PIPE, "stderr": PIPE, "stdin": None, "close_fds": True, "preexec_fn": lambda: os.setsid(), "env": env}  # pragma: no branch
 
     subprocess = await asyncio.create_subprocess_exec(*context.config["task_script"], **kwargs)

tests/test_artifacts.py

@@ -39,7 +39,7 @@ def context(rw_context):
         "credentials": {"a": "b"},
         "status": {"taskId": "taskId"},
         "task": {"expires": now.shift(days=2).isoformat(), "dependencies": ["dependency1", "dependency2"], "taskGroupId": "dependency0", "payload": {}},
-        "runId": "runId",
+        "runId": 0,
     }
     yield rw_context
 
@@ -142,7 +142,7 @@ async def test_create_artifact(context, fake_session, successful_queue):
     await create_artifact(context, path, "public/env/one.txt", content_type="text/plain", content_encoding=None, expires=expires)
     assert successful_queue.info == [
         "createArtifact",
-        ("taskId", "runId", "public/env/one.txt", {"storageType": "s3", "expires": expires, "contentType": "text/plain"}),
+        ("taskId", 0, "public/env/one.txt", {"storageType": "s3", "expires": expires, "contentType": "text/plain"}),
         {},
     ]
 

tests/test_task.py

@@ -41,12 +41,13 @@ def mobile_context(mobile_rw_context):
 def _craft_context(rw_context):
     rw_context.config["reclaim_interval"] = 0.001
     rw_context.config["task_max_timeout"] = 1
-    rw_context.config["task_script"] = ("bash", "-c", ">&2 echo bar && echo foo && exit 1")
+    rw_context.config["taskcluster_root_url"] = "https://tc"
+    rw_context.config["task_script"] = ("bash", "-c", ">&2 echo $TASK_ID && echo $RUN_ID && echo $TASKCLUSTER_ROOT_URL && exit 1")
     rw_context.claim_task = {
         "credentials": {"a": "b"},
         "status": {"taskId": "taskId"},
         "task": {"dependencies": ["dependency1", "dependency2"], "taskGroupId": "dependency0"},
-        "runId": "runId",
+        "runId": 0,
     }
     return rw_context
 
@@ -482,7 +483,7 @@ def test_is_action(task, expected):
 def test_prepare_to_run_task(context):
     claim_task = context.claim_task
     context.claim_task = None
-    expected = {"taskId": "taskId", "runId": "runId"}
+    expected = {"taskId": "taskId", "runId": 0}
     path = os.path.join(context.config["work_dir"], "current_task_info.json")
     assert swtask.prepare_to_run_task(context, claim_task) == expected
     assert os.path.exists(path)
@@ -496,7 +497,7 @@ def test_prepare_to_run_task(context):
 async def test_run_task(context):
     status = await swtask.run_task(context, noop_to_cancellable_process)
     log_file = log.get_log_filename(context)
-    assert read(log_file) in ("bar\nfoo\nexit code: 1\n", "foo\nbar\nexit code: 1\n")
+    assert read(log_file) in ("taskId\n0\nhttps://tc\nexit code: 1\n", "taskId\n0\nhttps://tc\nexit code: 1\n")
     assert status == 1
 
 
@@ -570,29 +571,29 @@ async def test_run_task_timeout(context):
 async def test_reportCompleted(context, successful_queue):
     context.temp_queue = successful_queue
     await swtask.complete_task(context, 0)
-    assert successful_queue.info == ["reportCompleted", ("taskId", "runId"), {}]
+    assert successful_queue.info == ["reportCompleted", ("taskId", 0), {}]
 
 
 @pytest.mark.asyncio
 async def test_reportFailed(context, successful_queue):
     context.temp_queue = successful_queue
     await swtask.complete_task(context, 1)
-    assert successful_queue.info == ["reportFailed", ("taskId", "runId"), {}]
+    assert successful_queue.info == ["reportFailed", ("taskId", 0), {}]
 
 
 @pytest.mark.asyncio
 async def test_reportException(context, successful_queue):
     context.temp_queue = successful_queue
     await swtask.complete_task(context, 2)
-    assert successful_queue.info == ["reportException", ("taskId", "runId", {"reason": "worker-shutdown"}), {}]
+    assert successful_queue.info == ["reportException", ("taskId", 0, {"reason": "worker-shutdown"}), {}]
 
 
 @pytest.mark.parametrize("exit_code", (245, 241))
 @pytest.mark.asyncio
 async def test_reversed_statuses(context, successful_queue, exit_code):
     context.temp_queue = successful_queue
     await swtask.complete_task(context, exit_code)
-    assert successful_queue.info == ["reportException", ("taskId", "runId", {"reason": context.config["reversed_statuses"][exit_code]}), {}]
+    assert successful_queue.info == ["reportException", ("taskId", 0, {"reason": context.config["reversed_statuses"][exit_code]}), {}]
 
 
 # complete_task {{{1

tests/test_worker.py

@@ -25,7 +25,14 @@
 # constants helpers and fixtures {{{1
 @pytest.fixture(scope="function")
 def context(rw_context):
+    rw_context.config["taskcluster_root_url"] = "https://tc"
     rw_context.credentials_timestamp = arrow.utcnow().shift(minutes=-10).int_timestamp
+    rw_context.claim_task = {
+        "credentials": {"a": "b"},
+        "status": {"taskId": "taskId"},
+        "task": {"dependencies": ["dependency1", "dependency2"], "taskGroupId": "dependency0"},
+        "runId": 0,
+    }
     yield rw_context