Do not use --ignore-missing-args for rsync

rsync --ignore-missing-args is only supported with rsync 3.1. CentOS 7
uses rsync 3.0 and fails.

We ignore missing remote files, so remove the argument and let the role
ignore an error if the files do not exist.

Update fetch-tox-output to use failed_when as well. We really want the
role not to fail (failed_when) instead of showing a failure and then the
playbook ignore it (ignore_errors).

Change-Id: I24bfb5519acccd7fd36b4839bb598436b4c8f01c
This commit is contained in:
Andreas Jaeger 2017-12-20 14:54:37 +01:00
parent 7d5f01c88e
commit 57fbc6e96e
3 changed files with 5 additions and 5 deletions

View File

@ -12,8 +12,6 @@
synchronize: synchronize:
dest: "{{ zuul.executor.log_root }}" dest: "{{ zuul.executor.log_root }}"
mode: pull mode: pull
rsync_opts:
- "--ignore-missing-args"
src: "{{ zuul_work_dir }}/{{ item }}" src: "{{ zuul_work_dir }}/{{ item }}"
verify_host: true verify_host: true
with_items: with_items:
@ -21,3 +19,5 @@
- "*testrepository.subunit.gz" - "*testrepository.subunit.gz"
when: when:
- stestr_stat.stat.exists - stestr_stat.stat.exists
# some tox runs may not create test-results
failed_when: false

View File

@ -12,8 +12,6 @@
synchronize: synchronize:
dest: "{{ zuul.executor.log_root }}" dest: "{{ zuul.executor.log_root }}"
mode: pull mode: pull
rsync_opts:
- "--ignore-missing-args"
src: "{{ zuul_work_dir }}/{{ item }}" src: "{{ zuul_work_dir }}/{{ item }}"
verify_host: true verify_host: true
with_items: with_items:
@ -21,3 +19,5 @@
- "*testrepository.subunit.gz" - "*testrepository.subunit.gz"
when: when:
- testrepository_stat.stat.exists - testrepository_stat.stat.exists
# some tox runs may not create test-results
failed_when: false

View File

@ -40,4 +40,4 @@
with_items: "{{ envlist }}" with_items: "{{ envlist }}"
# some tox runs may not create a virtualenv and thus have # some tox runs may not create a virtualenv and thus have
# no ./tox/env directory # no ./tox/env directory
ignore_errors: yes failed_when: false