From 3247983823773a575f02e71947e41c9cfc7e74f8 Mon Sep 17 00:00:00 2001 From: DanielDisisto <30640292+DanielDisisto@users.noreply.github.com> Date: Thu, 20 Jun 2019 13:55:05 +1000 Subject: [PATCH] Failing requirements update when scm_type != git The `git_result` variable is incorrectly checked as being `defined` vs. `not skipped`. This causes SVN (or any non-GIT) project update to fail consistently when `doesRequirementsExist.stat.exists` is true Signed-off-by: DanielDisisto --- awx/playbooks/project_update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/playbooks/project_update.yml b/awx/playbooks/project_update.yml index 14c46ed1ad..25cbef5951 100644 --- a/awx/playbooks/project_update.yml +++ b/awx/playbooks/project_update.yml @@ -152,7 +152,7 @@ args: chdir: "{{project_path|quote}}/roles" register: galaxy_result - when: doesRequirementsExist.stat.exists and (scm_version is undefined or (git_result is defined and git_result['before'] == git_result['after'])) + when: doesRequirementsExist.stat.exists and (scm_version is undefined or (git_result is not skipped and git_result['before'] == git_result['after'])) changed_when: "'was installed successfully' in galaxy_result.stdout" - name: fetch galaxy roles from requirements.yml (forced update)