External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 12:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3177 from wenottingham/i-am-going-to-need-a-diagram-for-this

Browse Source 
Fix project updates to properly pull in role requirements.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-02-13 23:16:34 +00:00
committed by GitHub
parent ae7d26fab0 5df384edd6
commit 808ed74700
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
awx/playbooks/project_update.yml
View File

@@ -50,12 +50,12 @@
version: "{{scm_branch|quote}}" version: "{{scm_branch|quote}}"
force: "{{scm_clean}}" force: "{{scm_clean}}"
accept_hostkey: "{{scm_accept_hostkey|default(omit)}}" accept_hostkey: "{{scm_accept_hostkey|default(omit)}}"
register: scm_result register: git_result
- name: Set the git repository version - name: Set the git repository version
set_fact: set_fact:
scm_version: "{{ scm_result['after'] }}" scm_version: "{{ git_result['after'] }}"
when: "'after' in scm_result" when: "'after' in git_result"
when: scm_type == 'git' when: scm_type == 'git'
- block: - block:
@@ -65,12 +65,12 @@
repo: "{{scm_url|quote}}" repo: "{{scm_url|quote}}"
revision: "{{scm_branch|quote}}" revision: "{{scm_branch|quote}}"
force: "{{scm_clean}}" force: "{{scm_clean}}"
register: scm_result register: hg_result
- name: Set the hg repository version - name: Set the hg repository version
set_fact: set_fact:
scm_version: "{{ scm_result['after'] }}" scm_version: "{{ hg_result['after'] }}"
when: "'after' in scm_result" when: "'after' in hg_result"
- name: parse hg version string properly - name: parse hg version string properly
set_fact: set_fact:
@@ -86,12 +86,12 @@
force: "{{scm_clean}}" force: "{{scm_clean}}"
username: "{{scm_username|default(omit)}}" username: "{{scm_username|default(omit)}}"
password: "{{scm_password|default(omit)}}" password: "{{scm_password|default(omit)}}"
register: scm_result register: svn_result
- name: Set the svn repository version - name: Set the svn repository version
set_fact: set_fact:
scm_version: "{{ scm_result['after'] }}" scm_version: "{{ svn_result['after'] }}"
when: "'after' in scm_result" when: "'after' in svn_result"
- name: parse subversion version string properly - name: parse subversion version string properly
set_fact: set_fact:
@@ -144,13 +144,13 @@
args: args:
chdir: "{{project_path|quote}}/roles" chdir: "{{project_path|quote}}/roles"
register: galaxy_result register: galaxy_result
when: doesRequirementsExist.stat.exists and scm_result is undefined when: doesRequirementsExist.stat.exists and (scm_version is undefined or (git_result is defined and git_result['before'] == git_result['after']))
changed_when: "'was installed successfully' in galaxy_result.stdout" changed_when: "'was installed successfully' in galaxy_result.stdout"
- name: fetch galaxy roles from requirements.yml (forced update) - name: fetch galaxy roles from requirements.yml (forced update)
command: ansible-galaxy install -r requirements.yml -p {{project_path|quote}}/roles/ --force command: ansible-galaxy install -r requirements.yml -p {{project_path|quote}}/roles/ --force
args: args:
chdir: "{{project_path|quote}}/roles" chdir: "{{project_path|quote}}/roles"
when: doesRequirementsExist.stat.exists and scm_result is defined when: doesRequirementsExist.stat.exists and galaxy_result is skipped
when: scm_full_checkout|bool and roles_enabled|bool when: roles_enabled|bool