diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-17 13:56:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 13:56:42 -0800 |
| commit | 7e83e65fc7a76df0530a56e3f6e3897cb95c316d (patch) | |
| tree | 337096dab9658fc7413af71b7a3eb6bb98c2050a /roles/openshift_provisioners | |
| parent | fba3c1c4f3ffc1f0341a20192d392f16bf7659f4 (diff) | |
| parent | 1dc910c68f845022f8749708bf191907e11efc13 (diff) | |
| download | openshift-7e83e65fc7a76df0530a56e3f6e3897cb95c316d.tar.gz openshift-7e83e65fc7a76df0530a56e3f6e3897cb95c316d.tar.bz2 openshift-7e83e65fc7a76df0530a56e3f6e3897cb95c316d.tar.xz openshift-7e83e65fc7a76df0530a56e3f6e3897cb95c316d.zip | |
Merge pull request #6751 from vrutkovs/apply-check-rc
Automatic merge from submit-queue.
Check that rc != 0 for steps with 'failed_when'
Some parts don't check the result rc at all, some check that 'error' is present there.
Instead the safest way is to check for both
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534538
Diffstat (limited to 'roles/openshift_provisioners')
| -rw-r--r-- | roles/openshift_provisioners/tasks/oc_apply.yaml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/roles/openshift_provisioners/tasks/oc_apply.yaml b/roles/openshift_provisioners/tasks/oc_apply.yaml index a4ce53eae..239e1f1cc 100644 --- a/roles/openshift_provisioners/tasks/oc_apply.yaml +++ b/roles/openshift_provisioners/tasks/oc_apply.yaml @@ -15,7 +15,9 @@ apply -f {{ file_name }} -n {{ namespace }} register: generation_apply - failed_when: "'error' in generation_apply.stderr" + failed_when: + - "'error' in generation_apply.stderr" + - "generation_apply.rc != 0" changed_when: no - name: Determine change status of {{file_content.kind}} {{file_content.metadata.name}} @@ -36,7 +38,9 @@ delete -f {{ file_name }} -n {{ namespace }} register: generation_delete - failed_when: "'error' in generation_delete.stderr" + failed_when: + - "'error' in generation_delete.stderr" + - "generation_delete.rc != 0" changed_when: generation_delete.rc == 0 when: generation_apply.rc != 0 @@ -46,6 +50,8 @@ apply -f {{ file_name }} -n {{ namespace }} register: generation_apply - failed_when: "'error' in generation_apply.stderr" + failed_when: + - "'error' in generation_apply.stderr" + - "generation_apply.rc != 0" changed_when: generation_apply.rc == 0 when: generation_apply.rc != 0 |