From 51aed19b29ab2723e6c580eee01a181d58c7e080 Mon Sep 17 00:00:00 2001 From: Nicolas Delvaux Date: Wed, 21 Oct 2020 23:52:06 +0200 Subject: [PATCH 1/2] Expose {awx,tower}_project_scm_branch variables in the environment --- awx/main/models/jobs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 8f42b9d5778b..c31f0537a582 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -798,6 +798,7 @@ def awx_meta_vars(self): if self.project: for name in ('awx', 'tower'): r['{}_project_revision'.format(name)] = self.project.scm_revision + r['{}_project_scm_branch'.format(name)] = self.project.scm_branch if self.job_template: for name in ('awx', 'tower'): r['{}_job_template_id'.format(name)] = self.job_template.pk From a58e37e31f46d414c604b55e70463740b248c979 Mon Sep 17 00:00:00 2001 From: Nicolas Delvaux Date: Wed, 21 Oct 2020 23:55:34 +0200 Subject: [PATCH 2/2] Expose {awx,tower}_job_scm_branch variables in the environment related #8429 --- awx/main/models/jobs.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index c31f0537a582..2c274e18f6c6 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -799,6 +799,9 @@ def awx_meta_vars(self): for name in ('awx', 'tower'): r['{}_project_revision'.format(name)] = self.project.scm_revision r['{}_project_scm_branch'.format(name)] = self.project.scm_branch + if self.scm_branch: + for name in ('awx', 'tower'): + r['{}_job_scm_branch'.format(name)] = self.scm_branch if self.job_template: for name in ('awx', 'tower'): r['{}_job_template_id'.format(name)] = self.job_template.pk