From d0c510563f94975dacdf185b1cc539918cc4a948 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 17 Mar 2020 10:37:51 -0400 Subject: [PATCH] Allow scm_branch in notifications. --- awx/main/models/notifications.py | 3 ++- awx/main/tests/functional/models/test_notifications.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/main/models/notifications.py b/awx/main/models/notifications.py index f731a03ce0..24d0daee4c 100644 --- a/awx/main/models/notifications.py +++ b/awx/main/models/notifications.py @@ -269,7 +269,7 @@ class JobNotificationMixin(object): 'timeout', 'use_fact_cache', 'launch_type', 'status', 'failed', 'started', 'finished', 'elapsed', 'job_explanation', 'execution_node', 'controller_node', 'allow_simultaneous', 'scm_revision', 'diff_mode', 'job_slice_number', 'job_slice_count', 'custom_virtualenv', - 'approval_status', 'approval_node_name', 'workflow_url', + 'approval_status', 'approval_node_name', 'workflow_url', 'scm_branch', {'host_status_counts': ['skipped', 'ok', 'changed', 'failed', 'failures', 'dark' 'processed', 'rescued', 'ignored']}, {'summary_fields': [{'inventory': ['id', 'name', 'description', 'has_active_failures', @@ -313,6 +313,7 @@ class JobNotificationMixin(object): 'modified': datetime.datetime(2018, 12, 13, 6, 4, 0, 0, tzinfo=datetime.timezone.utc), 'name': 'Stub JobTemplate', 'playbook': 'ping.yml', + 'scm_branch': '', 'scm_revision': '', 'skip_tags': '', 'start_at_task': '', diff --git a/awx/main/tests/functional/models/test_notifications.py b/awx/main/tests/functional/models/test_notifications.py index 57fd4cca91..a083fd9ae4 100644 --- a/awx/main/tests/functional/models/test_notifications.py +++ b/awx/main/tests/functional/models/test_notifications.py @@ -39,6 +39,7 @@ class TestJobNotificationMixin(object): 'modified': datetime.datetime, 'name': str, 'playbook': str, + 'scm_branch': str, 'scm_revision': str, 'skip_tags': str, 'start_at_task': str,