Revert "Fix linting issues found via project-config"

This has syntax errors.

This reverts commit d3128dab95.

Change-Id: Ida6569d384f50095cc228625c7d6e73e154270ae
This commit is contained in:
James E. Blair 2017-09-14 13:10:07 -06:00
parent 2fe2910b5f
commit dcd89b2686
4 changed files with 33 additions and 46 deletions

View File

@ -3,9 +3,6 @@
- name: Update apt cache - name: Update apt cache
become: yes become: yes
command: apt-get update command: apt-get update
# skip linting for above comment
tags:
- skip_ansible_lint
- name: Update dnf cache - name: Update dnf cache
become: yes become: yes
@ -26,4 +23,4 @@
command: "{{ item }}" command: "{{ item }}"
with_items: with_items:
- zypper clean - zypper clean
- zypper refresh - zypper refresh

View File

@ -1,5 +1,4 @@
- name: include the log path role - include_role:
include_role:
name: set-zuul-log-path-fact name: set-zuul-log-path-fact
- debug: - debug:

View File

@ -1,43 +1,35 @@
- name: Allow pushing to non-bare repo - name: Allow pushing to non-bare repo
git_config: command: "git config --local receive.denyCurrentBranch ignore"
scope: local args:
name: receive.denyCurrentBranch chdir: "{{ ansible_user_dir }}/{{ item.src_dir}}"
value: ignore
repo: "{{ ansible_user_dir }}/{{ item.src_dir}}"
with_items: "{{ zuul.projects }}" with_items: "{{ zuul.projects }}"
- block: - name: Synchronize src repos to workspace directory
# Do not lint these tasks, gets confused by git actions that cannot be done command: "git push --mirror git+ssh://{{ ansible_user }}@{{ ansible_host }}/{{ ansible_user_dir }}/{{ item.src_dir}}"
# by git modules args:
tags: chdir: "{{ zuul.executor.work_root }}/{{ item.src_dir }}"
- skip_ansible_lint with_items: "{{ zuul.projects }}"
delegate_to: localhost
- name: Synchronize src repos to workspace directory - name: Determine local HEAD
command: "git push --mirror git+ssh://{{ ansible_user }}@{{ ansible_host }}/{{ ansible_user_dir }}/{{ item.src_dir}}" shell: "git status |head -1 |awk '{ print $NF }'"
args: args:
chdir: "{{ zuul.executor.work_root }}/{{ item.src_dir }}" chdir: "{{ zuul.executor.work_root }}/{{ item.src_dir }}"
with_items: "{{ zuul.projects }}" with_items: "{{ zuul.projects }}"
delegate_to: localhost delegate_to: localhost
register: statuses
- name: Determine local HEAD # Do this as a multi-line shell so that we can do the loop once
shell: "git status |head -1 |awk '{ print $NF }'" - name: Update remote repository state correctly
args: shell: |
chdir: "{{ zuul.executor.work_root }}/{{ item.src_dir }}" # Reset is needed because we pushed to a non-bare repo
with_items: "{{ zuul.projects }}" git reset --hard
delegate_to: localhost # Undo the config setting we did above
register: statuses git config --local --unset receive.denyCurrentBranch
# checkout the branch matching the branch set up by the executor
# Do this as a multi-line shell so that we can do the loop once git checkout {{ item.1.stdout }}
- name: Update remote repository state correctly args:
shell: | chdir: "{{ ansible_user_dir }}/{{ item.0.src_dir }}"
# Reset is needed because we pushed to a non-bare repo with_together:
git reset --hard - "{{ zuul.projects }}"
# Undo the config setting we did above - "{{ statuses.results }}"
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 }}"

View File

@ -1,5 +1,4 @@
- name: include the log path role - include_role:
include_role:
name: set-zuul-log-path-fact name: set-zuul-log-path-fact
- name: Create log directories - name: Create log directories