From 4c338cab164a1cc4141ec69ce936a6615cd59a69 Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Tue, 26 Nov 2024 23:07:38 +0000
Subject: [PATCH] Bug 1932655: upgrade taskgraph to 12.1.0
 r=taskgraph-reviewers,mach-reviewers,ahal

Mainly to pick up https://github.com/taskcluster/taskgraph/pull/604 and https://github.com/taskcluster/taskgraph/pull/606

Differential Revision: https://phabricator.services.mozilla.com/D229800

UltraBlame original commit: f97cba74e8bd9653347e416ada5e077da97d6c99
---
 third_party/python/pyproject.toml             |  2 +-
 third_party/python/requirements.txt           |  6 +--
 .../METADATA                                  |  7 +--
 .../RECORD                                    | 50 ++++++++++---------
 .../WHEEL                                     |  4 +-
 .../entry_points.txt                          |  0
 .../licenses/LICENSE                          |  0
 .../taskgraph/__init__.py                     |  2 +-
 .../taskcluster_taskgraph/taskgraph/create.py | 40 +++++++++++++--
 .../taskgraph/optimize/strategies.py          | 19 +++----
 .../taskgraph/run-task/fetch-content          | 25 +++++++++-
 .../taskgraph/run-task/run-task               | 37 ++++++++++++--
 third_party/python/uv.lock                    | 28 +++++------
 third_party/python/uv.lock.hash               |  2 +-
 14 files changed, 150 insertions(+), 72 deletions(-)
 rename third_party/python/taskcluster_taskgraph/{taskcluster_taskgraph-12.0.0.dist-info => taskcluster_taskgraph-12.1.0.dist-info}/METADATA (99%)
 rename third_party/python/taskcluster_taskgraph/{taskcluster_taskgraph-12.0.0.dist-info => taskcluster_taskgraph-12.1.0.dist-info}/RECORD (95%)
 rename third_party/python/taskcluster_taskgraph/{taskcluster_taskgraph-12.0.0.dist-info => taskcluster_taskgraph-12.1.0.dist-info}/WHEEL (95%)
 rename third_party/python/taskcluster_taskgraph/{taskcluster_taskgraph-12.0.0.dist-info => taskcluster_taskgraph-12.1.0.dist-info}/entry_points.txt (100%)
 rename third_party/python/taskcluster_taskgraph/{taskcluster_taskgraph-12.0.0.dist-info => taskcluster_taskgraph-12.1.0.dist-info}/licenses/LICENSE (100%)

diff --git a/third_party/python/pyproject.toml b/third_party/python/pyproject.toml
index 6e0ce96e93395..84d8c00b2d885 100644
--- a/third_party/python/pyproject.toml
+++ b/third_party/python/pyproject.toml
@@ -581,7 +581,7 @@ taskgraph
 =
 12
 .
-0
+1
 "
 "
 taskcluster
diff --git a/third_party/python/requirements.txt b/third_party/python/requirements.txt
index 5c0aa5110c505..79b33c1e92b1a 100644
--- a/third_party/python/requirements.txt
+++ b/third_party/python/requirements.txt
@@ -5019,7 +5019,7 @@ taskgraph
 =
 12
 .
-0
+1
 .
 0
 \
@@ -5029,7 +5029,7 @@ hash
 =
 sha256
 :
-96a6b04bb349621664d15bbb5856018175ce85999d6e0293374603f804c7234b
+c37b0ff65ab6ae3ae322bf1ecd4d3453db01b37f22164d9a33ab77e634a34d9a
 \
 -
 -
@@ -5037,7 +5037,7 @@ hash
 =
 sha256
 :
-7554e8709552918a66f03029134aa99a5c9414a839962d84c00e84ee848ab97e
+222ba9f729e6d970de8c177251e3a5f29010332d7cc6ca8967fd8c8b73fa2c1b
 taskcluster
 -
 urls
diff --git a/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/METADATA b/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/METADATA
similarity index 99%
rename from third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/METADATA
rename to third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/METADATA
index 7d65e96776b1c..af91a430194a8 100644
--- a/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/METADATA
+++ b/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/METADATA
@@ -14,7 +14,7 @@ Version
 :
 12
 .
-0
+1
 .
 0
 Summary
@@ -71,11 +71,6 @@ mozilla
 .
 com
 >
-License
--
-File
-:
-LICENSE
 Classifier
 :
 Development
diff --git a/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/RECORD b/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/RECORD
similarity index 95%
rename from third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/RECORD
rename to third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/RECORD
index 2a03de435051c..a777c73e0f671 100644
--- a/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/RECORD
+++ b/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/RECORD
@@ -5,9 +5,7 @@ __init__
 py
 sha256
 =
-vrsuaZ4DumehJiAAPHD7O481ePEpN5N_9vuv
--
-MEZuM4
+_H9_zoYEWGO9c2L_M63SN76YWczgIqzggz_fETwqurI
 718
 taskgraph
 /
@@ -25,8 +23,8 @@ create
 py
 sha256
 =
-_zokjSM3ZaO04l2LiMhenE8qXDZVfYvueIIu5hGUhzc
-5185
+sUKEUAFp3X_1Bs99alh4jw7cFXtDFsbh4T2pAkp5mC0
+5315
 taskgraph
 /
 decision
@@ -306,10 +304,12 @@ strategies
 py
 sha256
 =
-nEiUZORwflThbuO8U7CI9IPdmEMXQTUk5var4_T
+tnyDw6
+-
+z5S2K7710Vww
 -
-jco
-3576
+EsiqtEqZl5rVYRqg8joJ1dk
+3638
 taskgraph
 /
 run
@@ -321,8 +321,8 @@ fetch
 content
 sha256
 =
-_1MWiyOChavZHSjYIweh2EGle1WGIlmwZ91GhsW0jRU
-33409
+_bBs9T6YSNfKL338XqPWmzXbDBc7YzKwG5YMmnnSYvE
+33643
 taskgraph
 /
 run
@@ -362,10 +362,8 @@ run
 task
 sha256
 =
-Cvv3L3LLX_7dL0sBPXayL5fH08Nnz0d
--
-BPUMOv8RVuY
-46161
+SS_NegHr87dWNXBx_zK2Tuq2XUMP_t__iUZ5N5rdjB4
+46229
 taskgraph
 /
 transforms
@@ -900,7 +898,7 @@ taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 .
@@ -911,17 +909,19 @@ info
 METADATA
 sha256
 =
-Mn2yTn5uqSbHq
+hHjxzh9
+-
+muODo4PH68zt0MYV2KSvF06dBBOa
 -
-sb1kFN0YIMSrUibyixqYr
+Gh5t
 -
-rMpuKug
-4947
+I
+4925
 taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 .
@@ -932,13 +932,15 @@ info
 WHEEL
 sha256
 =
-1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY
+C2FUgwZgiLbznR
+-
+k0b_5k3Ai_1aASOXDss3lzCUsUug
 87
 taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 .
@@ -963,7 +965,7 @@ taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 .
@@ -982,7 +984,7 @@ taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 .
diff --git a/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/WHEEL b/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/WHEEL
similarity index 95%
rename from third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/WHEEL
rename to third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/WHEEL
index 0ad25981674fc..d76846ef0bd6d 100644
--- a/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/WHEEL
+++ b/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/WHEEL
@@ -10,9 +10,9 @@ Generator
 hatchling
 1
 .
-25
+26
 .
-0
+3
 Root
 -
 Is
diff --git a/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/entry_points.txt b/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/entry_points.txt
similarity index 100%
rename from third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/entry_points.txt
rename to third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/entry_points.txt
diff --git a/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/licenses/LICENSE b/third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/licenses/LICENSE
similarity index 100%
rename from third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.0.0.dist-info/licenses/LICENSE
rename to third_party/python/taskcluster_taskgraph/taskcluster_taskgraph-12.1.0.dist-info/licenses/LICENSE
diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/__init__.py b/third_party/python/taskcluster_taskgraph/taskgraph/__init__.py
index 3480931a631e6..641233940c344 100644
--- a/third_party/python/taskcluster_taskgraph/taskgraph/__init__.py
+++ b/third_party/python/taskcluster_taskgraph/taskgraph/__init__.py
@@ -3,7 +3,7 @@
 "
 12
 .
-0
+1
 .
 0
 "
diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/create.py b/third_party/python/taskcluster_taskgraph/taskgraph/create.py
index 4c45e07d18154..12f1a6c1487e0 100644
--- a/third_party/python/taskcluster_taskgraph/taskgraph/create.py
+++ b/third_party/python/taskcluster_taskgraph/taskgraph/create.py
@@ -3,6 +3,8 @@
 import
 logging
 import
+os
+import
 sys
 from
 concurrent
@@ -581,19 +583,47 @@
 "
 )
     
-res
+proxy_url
 =
-session
+os
 .
-put
+environ
+.
+get
 (
-f
+"
+TASKCLUSTER_PROXY_URL
+"
 "
 http
 :
 /
 /
 taskcluster
+"
+)
+.
+rstrip
+(
+        
+"
+/
+"
+    
+)
+    
+res
+=
+session
+.
+put
+(
+        
+f
+"
+{
+proxy_url
+}
 /
 queue
 /
@@ -605,9 +635,11 @@
 task_id
 }
 "
+        
 json
 =
 task_def
+    
 )
     
 if
diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/optimize/strategies.py b/third_party/python/taskcluster_taskgraph/taskgraph/optimize/strategies.py
index b73360f14b4fd..4a720955d5bbd 100644
--- a/third_party/python/taskcluster_taskgraph/taskgraph/optimize/strategies.py
+++ b/third_party/python/taskcluster_taskgraph/taskgraph/optimize/strategies.py
@@ -393,27 +393,28 @@
 get
 (
 "
-repository_type
+base_rev
 "
 )
-=
-=
-"
-hg
-"
 and
 params
 .
 get
 (
 "
-pushlog_id
+head_rev
 "
 )
 =
 =
--
-1
+params
+.
+get
+(
+"
+base_rev
+"
+)
 :
             
 return
diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/run-task/fetch-content b/third_party/python/taskcluster_taskgraph/taskgraph/run-task/fetch-content
index c246c9560a510..1aa5735a74725 100644
--- a/third_party/python/taskcluster_taskgraph/taskgraph/run-task/fetch-content
+++ b/third_party/python/taskcluster_taskgraph/taskgraph/run-task/fetch-content
@@ -1317,12 +1317,33 @@ length
 is
 %
 d
+x
+-
+cache
+-
+status
+is
+:
+%
+s
 "
 %
 (
 url
 size
 content_length
+fh
+.
+getheader
+(
+"
+x
+-
+cache
+-
+status
+"
+)
 )
 )
 else
@@ -4636,12 +4657,12 @@ ls
 remote
 "
 repo
-'
+"
 refs
 /
 heads
 /
-'
+"
 +
 commit
 ]
diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/run-task/run-task b/third_party/python/taskcluster_taskgraph/taskgraph/run-task/run-task
index 49ce300d80e70..a281984b201f2 100644
--- a/third_party/python/taskcluster_taskgraph/taskgraph/run-task/run-task
+++ b/third_party/python/taskcluster_taskgraph/taskgraph/run-task/run-task
@@ -226,11 +226,8 @@ Optional
 SECRET_BASEURL_TPL
 =
 "
-http
-:
-/
-/
-taskcluster
+{
+}
 /
 secrets
 /
@@ -239,8 +236,38 @@ v1
 secret
 /
 {
+{
+}
 }
 "
+.
+format
+(
+os
+.
+environ
+.
+get
+(
+"
+TASKCLUSTER_PROXY_URL
+"
+"
+http
+:
+/
+/
+taskcluster
+"
+)
+.
+rstrip
+(
+'
+/
+'
+)
+)
 GITHUB_SSH_FINGERPRINT
 =
 (
diff --git a/third_party/python/uv.lock b/third_party/python/uv.lock
index b040f35ed8a88..5a4b073b605da 100644
--- a/third_party/python/uv.lock
+++ b/third_party/python/uv.lock
@@ -20153,7 +20153,7 @@ specifier
 =
 12
 .
-0
+1
 "
 }
 {
@@ -32488,7 +32488,7 @@ version
 "
 12
 .
-0
+1
 .
 0
 "
@@ -32609,17 +32609,17 @@ org
 /
 packages
 /
-c4
+2a
 /
-73
+f0
 /
-29a26874c065ed2f6e5142cedd6e258efd67729c6c15f7e6f180ae6b8db3
+d7beb4940c92a6ca0b163e3d5eb5f435586a67e5f6d8924810a06563eb04
 /
 taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 .
@@ -32632,11 +32632,11 @@ hash
 "
 sha256
 :
-96a6b04bb349621664d15bbb5856018175ce85999d6e0293374603f804c7234b
+c37b0ff65ab6ae3ae322bf1ecd4d3453db01b37f22164d9a33ab77e634a34d9a
 "
 size
 =
-375302
+375550
 }
 wheels
 =
@@ -32657,17 +32657,17 @@ org
 /
 packages
 /
-a4
+73
 /
-5f
+83
 /
-02c48a4890f63def2b746b94a5f0f602478bb84994c3223f6be24357b18f
+f5ba327be8c2482721029bddf2188450d82d86435a1c5cbc353f2ad5c76b
 /
 taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 -
@@ -32684,11 +32684,11 @@ hash
 "
 sha256
 :
-7554e8709552918a66f03029134aa99a5c9414a839962d84c00e84ee848ab97e
+222ba9f729e6d970de8c177251e3a5f29010332d7cc6ca8967fd8c8b73fa2c1b
 "
 size
 =
-193815
+193953
 }
 ]
 [
diff --git a/third_party/python/uv.lock.hash b/third_party/python/uv.lock.hash
index 61996768f2038..3e69628af4013 100644
--- a/third_party/python/uv.lock.hash
+++ b/third_party/python/uv.lock.hash
@@ -1 +1 @@
-0eecfeb2cd6b7471ac1ad212883553b4b17becf19d6e13b1b73c26d5b064deb2
+a15b1b09555c9bfe6c7a4233dc8b19bf4bf0bfdefde8427c0bbb895558aae6de