External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add blocks around the different SCMs, for clarity purposes.

Browse Source
This commit is contained in:
Bill Nottingham
2017-10-25 16:58:41 -04:00
parent 565d116955
commit 1285e8ffef
1 changed files with 89 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
awx/playbooks/project_update.yml
View File

@@ -23,6 +23,7 @@
state: absent state: absent
when: scm_delete_on_update|default('') when: scm_delete_on_update|default('')
- block:
- name: update project using git and accept hostkey - name: update project using git and accept hostkey
git: git:
dest: "{{project_path|quote}}" dest: "{{project_path|quote}}"
@@ -30,9 +31,7 @@
version: "{{scm_branch|quote}}" version: "{{scm_branch|quote}}"
force: "{{scm_clean}}" force: "{{scm_clean}}"
accept_hostkey: "{{scm_accept_hostkey}}" accept_hostkey: "{{scm_accept_hostkey}}"
#clone: "{{ scm_full_checkout }}" when: scm_accept_hostkey is defined
#update: "{{ scm_full_checkout }}"
when: scm_type == 'git' and scm_accept_hostkey is defined
register: scm_result register: scm_result
- name: Set the git repository version - name: Set the git repository version
@@ -46,25 +45,22 @@
repo: "{{scm_url}}" repo: "{{scm_url}}"
version: "{{scm_branch|quote}}" version: "{{scm_branch|quote}}"
force: "{{scm_clean}}" force: "{{scm_clean}}"
#clone: "{{ scm_full_checkout }}" when: scm_accept_hostkey is not defined
#update: "{{ scm_full_checkout }}"
when: scm_type == 'git' and scm_accept_hostkey is not defined
register: scm_result register: scm_result
- name: Set the git repository version - name: Set the git repository version
set_fact: set_fact:
scm_version: "{{ scm_result['after'] }}" scm_version: "{{ scm_result['after'] }}"
when: "'after' in scm_result" when: "'after' in scm_result"
when: scm_type == 'git'
- block:
- name: update project using hg - name: update project using hg
hg: hg:
dest: "{{project_path|quote}}" dest: "{{project_path|quote}}"
repo: "{{scm_url|quote}}" repo: "{{scm_url|quote}}"
revision: "{{scm_branch|quote}}" revision: "{{scm_branch|quote}}"
force: "{{scm_clean}}" force: "{{scm_clean}}"
#clone: "{{ scm_full_checkout }}"
#update: "{{ scm_full_checkout }}"
when: scm_type == 'hg'
register: scm_result register: scm_result
- name: Set the hg repository version - name: Set the hg repository version
@@ -72,15 +68,19 @@
scm_version: "{{ scm_result['after'] }}" scm_version: "{{ scm_result['after'] }}"
when: "'after' in scm_result" when: "'after' in scm_result"
- name: parse hg version string properly
set_fact:
scm_version: "{{scm_version|regex_replace('^([A-Za-z0-9]+).*$', '\\1')}}"
when: scm_type == 'hg'
- block:
- name: update project using svn - name: update project using svn
subversion: subversion:
dest: "{{project_path|quote}}" dest: "{{project_path|quote}}"
repo: "{{scm_url|quote}}" repo: "{{scm_url|quote}}"
revision: "{{scm_branch|quote}}" revision: "{{scm_branch|quote}}"
force: "{{scm_clean}}" force: "{{scm_clean}}"
#checkout: "{{ scm_full_checkout }}" when: not scm_username|default('')
#update: "{{ scm_full_checkout }}"
when: scm_type == 'svn' and not scm_username|default('')
register: scm_result register: scm_result
- name: Set the svn repository version - name: Set the svn repository version
@@ -96,9 +96,7 @@
force: "{{scm_clean}}" force: "{{scm_clean}}"
username: "{{scm_username|quote}}" username: "{{scm_username|quote}}"
password: "{{scm_password|quote}}" password: "{{scm_password|quote}}"
#checkout: "{{ scm_full_checkout }}" when: scm_username|default('')
#update: "{{ scm_full_checkout }}"
when: scm_type == 'svn' and scm_username|default('')
register: scm_result register: scm_result
- name: Set the svn repository version - name: Set the svn repository version
@@ -106,6 +104,11 @@
scm_version: "{{ scm_result['after'] }}" scm_version: "{{ scm_result['after'] }}"
when: "'after' in scm_result" when: "'after' in scm_result"
- name: parse subversion version string properly
set_fact:
scm_version: "{{scm_version|regex_replace('^.*Revision: ([0-9]+).*$', '\\1')}}"
when: scm_type == 'svn'
- block: - block:
- name: Ensure the project directory is present - name: Ensure the project directory is present
file: file:
@@ -120,13 +123,14 @@
project_path: "{{project_path}}" project_path: "{{project_path}}"
register: results register: results
when: scm_type == 'insights'
- name: Save Insights Version - name: Save Insights Version
set_fact: set_fact:
scm_version: "{{results.version}}" scm_version: "{{results.version}}"
when: scm_type == 'insights' and results is defined when: results is defined
when: scm_type == 'insights'
- block:
- name: detect requirements.yml - name: detect requirements.yml
stat: path={{project_path|quote}}/roles/requirements.yml stat: path={{project_path|quote}}/roles/requirements.yml
register: doesRequirementsExist register: doesRequirementsExist
@@ -135,18 +139,8 @@
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_full_checkout|bool when: doesRequirementsExist.stat.exists
when: scm_full_checkout|bool
# format provided by ansible is ["Revision: 12345", "URL: ..."]
- name: parse subversion version string properly
set_fact:
scm_version: "{{scm_version|regex_replace('^.*Revision: ([0-9]+).*$', '\\1')}}"
when: scm_type == 'svn'
- name: parse hg version string properly
set_fact:
scm_version: "{{scm_version|regex_replace('^([A-Za-z0-9]+).*$', '\\1')}}"
when: scm_type == 'hg'
- name: Repository Version - name: Repository Version
debug: msg="Repository Version {{ scm_version }}" debug: msg="Repository Version {{ scm_version }}"