scriptworker 62.2.0__tar.gz → 62.2.1__tar.gz

{scriptworker-62.2.0 → scriptworker-62.2.1}/HISTORY.rst

@@ -4,6 +4,13 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to `Semantic Versioning <http://semver.org/>`__.
 
+62.2.1 - 2025-12-01
+-------------------
+
+Fixed
+~~~~~
+- spurious CoT failure when verifying some tasks chaining to pushes with different .taskcluster.yml
+
 62.2.0 - 2025-11-28
 -------------------
 

{scriptworker-62.2.0 → scriptworker-62.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scriptworker
-Version: 62.2.0
+Version: 62.2.1
 Summary: Taskcluster scriptworker
 Author-email: Mozilla Release Engineering <releng@mozilla.com>
 License-File: LICENSE
@@ -28,8 +28,8 @@ Description-Content-Type: text/x-rst
 Scriptworker Readme
 ===================
 
-.. image:: https://travis-ci.org/mozilla-releng/scriptworker.svg?branch=master
-    :target: https://travis-ci.org/mozilla-releng/scriptworker
+.. image:: https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-releng/scriptworker/main/badge.svg
+    :target: https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-releng/scriptworker/main/latest
 
 .. image:: https://coveralls.io/repos/github/mozilla-releng/scriptworker/badge.svg?branch=master
     :target: https://coveralls.io/github/mozilla-releng/scriptworker?branch=master

{scriptworker-62.2.0 → scriptworker-62.2.1}/README.rst

@@ -2,8 +2,8 @@
 Scriptworker Readme
 ===================
 
-.. image:: https://travis-ci.org/mozilla-releng/scriptworker.svg?branch=master
-    :target: https://travis-ci.org/mozilla-releng/scriptworker
+.. image:: https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-releng/scriptworker/main/badge.svg
+    :target: https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-releng/scriptworker/main/latest
 
 .. image:: https://coveralls.io/repos/github/mozilla-releng/scriptworker/badge.svg?branch=master
     :target: https://coveralls.io/github/mozilla-releng/scriptworker?branch=master

{scriptworker-62.2.0 → scriptworker-62.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "scriptworker"
-version = "62.2.0"
+version = "62.2.1"
 description = "Taskcluster scriptworker"
 authors = [
     { name = "Mozilla Release Engineering", email = "releng@mozilla.com" },

{scriptworker-62.2.0 → scriptworker-62.2.1}/src/scriptworker/cot/verify.py

@@ -11,6 +11,7 @@ import argparse
 import asyncio
 import datetime
 import fnmatch
+import hashlib
 import logging
 import os
 import pprint
@@ -1007,7 +1008,8 @@ async def get_pushlog_info(decision_link):
     context = decision_link.context
     pushlog_url = context.config["pushlog_url"].format(repo=repo, revision=rev)
     log.info("Pushlog url {}".format(pushlog_url))
-    file_path = os.path.join(context.config["work_dir"], "{}_push_log.json".format(decision_link.name))
+    url_hash = hashlib.sha1(pushlog_url.encode("ascii")).hexdigest()
+    file_path = os.path.join(context.config["work_dir"], f"{url_hash}_push_log.json")
     pushlog_info = await load_json_or_yaml_from_url(context, pushlog_url, file_path, overwrite=False)
     if len(pushlog_info["pushes"]) != 1:
         log.warning("Pushlog error: expected a single push at {} but got {}!".format(pushlog_url, pushlog_info["pushes"]))
@@ -1430,7 +1432,8 @@ async def get_in_tree_template(link):
         and context.config.get("github_oauth_token")
     ):
         auth = aiohttp.BasicAuth(context.config["github_oauth_token"])
-    tmpl = await load_json_or_yaml_from_url(context, source_url, os.path.join(context.config["work_dir"], "{}_taskcluster.yml".format(link.name)), auth=auth)
+    url_hash = hashlib.sha1(source_url.encode("ascii")).hexdigest()
+    tmpl = await load_json_or_yaml_from_url(context, source_url, os.path.join(context.config["work_dir"], "{}_taskcluster.yml".format(url_hash)), auth=auth)
     return tmpl