Merge "Fix linting issues found via project-config"
This commit is contained in:
commit
2fe2910b5f
@ -3,6 +3,9 @@
|
||||
- name: Update apt cache
|
||||
become: yes
|
||||
command: apt-get update
|
||||
# skip linting for above comment
|
||||
tags:
|
||||
- skip_ansible_lint
|
||||
|
||||
- name: Update dnf cache
|
||||
become: yes
|
||||
@ -23,4 +26,4 @@
|
||||
command: "{{ item }}"
|
||||
with_items:
|
||||
- zypper clean
|
||||
- zypper refresh
|
||||
- zypper refresh
|
||||
|
@ -1,4 +1,5 @@
|
||||
- include_role:
|
||||
- name: include the log path role
|
||||
include_role:
|
||||
name: set-zuul-log-path-fact
|
||||
|
||||
- debug:
|
||||
|
@ -1,35 +1,43 @@
|
||||
- name: Allow pushing to non-bare repo
|
||||
command: "git config --local receive.denyCurrentBranch ignore"
|
||||
args:
|
||||
chdir: "{{ ansible_user_dir }}/{{ item.src_dir}}"
|
||||
git_config:
|
||||
scope: local
|
||||
name: receive.denyCurrentBranch
|
||||
value: ignore
|
||||
repo: "{{ ansible_user_dir }}/{{ item.src_dir}}"
|
||||
with_items: "{{ zuul.projects }}"
|
||||
|
||||
- name: Synchronize src repos to workspace directory
|
||||
command: "git push --mirror git+ssh://{{ ansible_user }}@{{ ansible_host }}/{{ ansible_user_dir }}/{{ item.src_dir}}"
|
||||
args:
|
||||
chdir: "{{ zuul.executor.work_root }}/{{ item.src_dir }}"
|
||||
with_items: "{{ zuul.projects }}"
|
||||
delegate_to: localhost
|
||||
- block:
|
||||
# Do not lint these tasks, gets confused by git actions that cannot be done
|
||||
# by git modules
|
||||
tags:
|
||||
- skip_ansible_lint
|
||||
|
||||
- name: Determine local HEAD
|
||||
shell: "git status |head -1 |awk '{ print $NF }'"
|
||||
args:
|
||||
chdir: "{{ zuul.executor.work_root }}/{{ item.src_dir }}"
|
||||
with_items: "{{ zuul.projects }}"
|
||||
delegate_to: localhost
|
||||
register: statuses
|
||||
- name: Synchronize src repos to workspace directory
|
||||
command: "git push --mirror git+ssh://{{ ansible_user }}@{{ ansible_host }}/{{ ansible_user_dir }}/{{ item.src_dir}}"
|
||||
args:
|
||||
chdir: "{{ zuul.executor.work_root }}/{{ item.src_dir }}"
|
||||
with_items: "{{ zuul.projects }}"
|
||||
delegate_to: localhost
|
||||
|
||||
# Do this as a multi-line shell so that we can do the loop once
|
||||
- name: Update remote repository state correctly
|
||||
shell: |
|
||||
# Reset is needed because we pushed to a non-bare repo
|
||||
git reset --hard
|
||||
# Undo the config setting we did above
|
||||
git config --local --unset receive.denyCurrentBranch
|
||||
# checkout the branch matching the branch set up by the executor
|
||||
git checkout {{ item.1.stdout }}
|
||||
args:
|
||||
chdir: "{{ ansible_user_dir }}/{{ item.0.src_dir }}"
|
||||
with_together:
|
||||
- "{{ zuul.projects }}"
|
||||
- "{{ statuses.results }}"
|
||||
- name: Determine local HEAD
|
||||
shell: "git status |head -1 |awk '{ print $NF }'"
|
||||
args:
|
||||
chdir: "{{ zuul.executor.work_root }}/{{ item.src_dir }}"
|
||||
with_items: "{{ zuul.projects }}"
|
||||
delegate_to: localhost
|
||||
register: statuses
|
||||
|
||||
# Do this as a multi-line shell so that we can do the loop once
|
||||
- name: Update remote repository state correctly
|
||||
shell: |
|
||||
# Reset is needed because we pushed to a non-bare repo
|
||||
git reset --hard
|
||||
# Undo the config setting we did above
|
||||
git config --local --unset receive.denyCurrentBranch
|
||||
# checkout the branch matching the branch set up by the executor
|
||||
git checkout {{ item.1.stdout }}
|
||||
args:
|
||||
chdir: "{{ ansible_user_dir }}/{{ item.0.src_dir }}"
|
||||
with_together:
|
||||
- "{{ zuul.projects }}"
|
||||
- "{{ statuses.results }}"
|
||||
|
@ -1,4 +1,5 @@
|
||||
- include_role:
|
||||
- name: include the log path role
|
||||
include_role:
|
||||
name: set-zuul-log-path-fact
|
||||
|
||||
- name: Create log directories
|
||||
|
Loading…
Reference in New Issue
Block a user