Merge pull request #2959 from haircommander/check_swap

test: properly check return code of results

contrib/test/integration/disable_swap.yml

@@ -1,5 +1,4 @@
 ---
-
 - name: All active swap devices are known
   command: 'swapon --show --ifexists --noheadings'
   changed_when: False  # only looking
@@ -12,8 +11,7 @@
 - name: All persistent swap devices from fstab are known
   command: findmnt --fstab --type swap --output SOURCE --noheadings
   # findmnt exit(1) if no swap devices found, expect real errors to appear on stderr
-  failed_when: result | failed and
-               result.stderr | trim | length
+  failed_when: result.rc != 0 and result.stderr | trim | length
   changed_when: False  # only looking
   register: result
 

contrib/test/integration/e2e-base.yml

@@ -52,7 +52,7 @@
 - name: wait for the cluster to be running
   command: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/_output/bin/kubectl get service kubernetes --namespace default"
   register: kube_poll
-  until: kube_poll | succeeded
+  until: kube_poll.rc == 0
   retries: 100
   delay: 30