From 595e093bbf286740bccca6470cc7cd1025c64fe8 Mon Sep 17 00:00:00 2001 From: Stevenson Michel Date: Mon, 30 Mar 2026 14:37:16 -0400 Subject: [PATCH 1/2] [CI-Fix] Pin setuptools_scm<10 to fix api-lint failure (#16376) Fix CI: Pin setuptools_scm<10 to fix api-lint build failure setuptools-scm 10.0.5 (with its new vcs-versioning dependency) requires a [tool.setuptools_scm] or [tool.vcs-versioning] section in pyproject.toml. AWX intentionally omits this section because it uses a custom version resolution via setup.cfg (version = attr: awx.get_version). The new major version of setuptools-scm treats the missing section as a fatal error when building the sdist in tox's isolated build, causing the linters environment to fail. Pinning to <10 restores compatibility with the existing version resolution strategy. Failing run: https://github.com/ansible/awx/actions/runs/23744310714 Branch: devel Co-authored-by: Claude Opus 4.6 (1M context) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3cb6dcf2bb..4697861719 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"] +requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2,<10"] build-backend = "setuptools.build_meta" # Do not uncomment the line below. We need to be able to override the version via a file, and this From e80ce43f87b18e2d9257d3e3f419d1c6f6ce528f Mon Sep 17 00:00:00 2001 From: melissalkelly Date: Tue, 31 Mar 2026 08:48:27 -0400 Subject: [PATCH 2/2] Fix workload identity project updates (#16373) * fix: enable workload identity credentials for project updates * Add explanatory comment for credential context handling * Revert build_passwords --- awx/main/tasks/jobs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/tasks/jobs.py b/awx/main/tasks/jobs.py index 80414390f8..e6f6a893f1 100644 --- a/awx/main/tasks/jobs.py +++ b/awx/main/tasks/jobs.py @@ -1682,7 +1682,7 @@ class RunProjectUpdate(BaseTask): return params def build_credentials_list(self, project_update): - if project_update.scm_type == 'insights' and project_update.credential: + if project_update.credential: return [project_update.credential] return []