diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-24 07:50:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 07:50:46 -0800 |
| commit | 0344a8f71af49cdf3827ccf6be339097369c12f7 (patch) | |
| tree | 222cf7200c5bed18499f0b92661fc0ab8bfc7cea /roles | |
| parent | 3abb49892a339c25fac1a320a84ca9049ae7bc6f (diff) | |
| parent | 966019481268cd0bf7b3f352cded283221c24e39 (diff) | |
| download | openshift-0344a8f71af49cdf3827ccf6be339097369c12f7.tar.gz openshift-0344a8f71af49cdf3827ccf6be339097369c12f7.tar.bz2 openshift-0344a8f71af49cdf3827ccf6be339097369c12f7.tar.xz openshift-0344a8f71af49cdf3827ccf6be339097369c12f7.zip | |
Merge pull request #6815 from vrutkovs/failed_when-rc-to-int
Automatic merge from submit-queue.
failed_when lists are implicitely ANDs, not ORs
For some reason I believed `failed_when` lists are considered to be ORs, but it turns out these are ANDs.
Fixes bug 1534538
Relates to #6751
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_metrics/tasks/oc_apply.yaml | 8 | ||||
| -rw-r--r-- | roles/openshift_provisioners/tasks/oc_apply.yaml | 12 |
2 files changed, 5 insertions, 15 deletions
diff --git a/roles/openshift_metrics/tasks/oc_apply.yaml b/roles/openshift_metrics/tasks/oc_apply.yaml index 057963c1a..30fdde94c 100644 --- a/roles/openshift_metrics/tasks/oc_apply.yaml +++ b/roles/openshift_metrics/tasks/oc_apply.yaml @@ -16,9 +16,7 @@ apply -f {{ file_name }} -n {{namespace}} register: generation_apply - failed_when: - - "'error' in generation_apply.stderr" - - "generation_apply.rc != 0" + failed_when: "'error' in generation_apply.stderr or (generation_apply.rc | int != 0)" changed_when: no - name: Determine change status of {{file_content.kind}} {{file_content.metadata.name}} @@ -30,7 +28,5 @@ register: version_changed vars: init_version: "{{ (generation_init is defined) | ternary(generation_init.stdout, '0') }}" - failed_when: - - "'error' in version_changed.stderr" - - "version_changed.rc != 0" + failed_when: "'error' in version_changed.stderr or version_changed.rc | int != 0" changed_when: version_changed.stdout | int > init_version | int diff --git a/roles/openshift_provisioners/tasks/oc_apply.yaml b/roles/openshift_provisioners/tasks/oc_apply.yaml index 239e1f1cc..27c8a4b81 100644 --- a/roles/openshift_provisioners/tasks/oc_apply.yaml +++ b/roles/openshift_provisioners/tasks/oc_apply.yaml @@ -15,9 +15,7 @@ apply -f {{ file_name }} -n {{ namespace }} register: generation_apply - failed_when: - - "'error' in generation_apply.stderr" - - "generation_apply.rc != 0" + failed_when: "'error' in generation_apply.stderr or generation_apply.rc != 0" changed_when: no - name: Determine change status of {{file_content.kind}} {{file_content.metadata.name}} @@ -38,9 +36,7 @@ delete -f {{ file_name }} -n {{ namespace }} register: generation_delete - failed_when: - - "'error' in generation_delete.stderr" - - "generation_delete.rc != 0" + failed_when: "'error' in generation_delete.stderr or generation_delete.rc != 0" changed_when: generation_delete.rc == 0 when: generation_apply.rc != 0 @@ -50,8 +46,6 @@ apply -f {{ file_name }} -n {{ namespace }} register: generation_apply - failed_when: - - "'error' in generation_apply.stderr" - - "generation_apply.rc != 0" + failed_when: "'error' in generation_apply.stderr or generation_apply.rc | int != 0" changed_when: generation_apply.rc == 0 when: generation_apply.rc != 0 |