Merge remote-tracking branch 'origin/dmw'

* origin/dmw:
  ci: update to Ansible 2.8.3
  tests: another random string changed in 2.8.3
  tests: fix sudo_flags_failure for Ansible 2.8.3
  ci: fix procps command line format warning

.ci/ci_lib.py

@@ -233,7 +233,7 @@ def proc_is_docker(pid):
 
 
 def get_interesting_procs(container_name=None):
-    args = ['ps', '-a', '-x', '-oppid=', '-opid=', '-ocomm=', '-ocommand=']
+    args = ['ps', 'ax', '-oppid=', '-opid=', '-ocomm=', '-ocommand=']
     if container_name is not None:
         args = ['docker', 'exec', container_name] + args
 

.travis.yml

@@ -36,25 +36,25 @@ matrix:
 
   include:
     # Debops tests.
-    # 2.8.0; 3.6 -> 2.7
+    # 2.8.3; 3.6 -> 2.7
     - python: "3.6"
-      env: MODE=debops_common VER=2.8.0
+      env: MODE=debops_common VER=2.8.3
     # 2.4.6.0; 2.7 -> 2.7
     - python: "2.7"
       env: MODE=debops_common VER=2.4.6.0
 
     # Sanity check against vanilla Ansible. One job suffices.
     - python: "2.7"
-      env: MODE=ansible VER=2.8.0 DISTROS=debian STRATEGY=linear
+      env: MODE=ansible VER=2.8.3 DISTROS=debian STRATEGY=linear
 
     # ansible_mitogen tests.
 
-    # 2.8.0 -> {debian, centos6, centos7}
+    # 2.8.3 -> {debian, centos6, centos7}
     - python: "3.6"
-      env: MODE=ansible VER=2.8.0
+      env: MODE=ansible VER=2.8.3
-    # 2.8.0 -> {debian, centos6, centos7}
+    # 2.8.3 -> {debian, centos6, centos7}
     - python: "2.7"
-      env: MODE=ansible VER=2.8.0
+      env: MODE=ansible VER=2.8.3
 
     # 2.4.6.0 -> {debian, centos6, centos7}
     - python: "3.6"

tests/ansible/integration/become/sudo_flags_failure.yml

@@ -17,5 +17,6 @@
           - out.failed
           - |
             ('sudo: no such option: --derps' in out.msg) or
+            ("sudo: invalid option -- '-'" in out.module_stderr) or
             ("sudo: unrecognized option `--derps'" in out.module_stderr) or
             ("sudo: unrecognized option '--derps'" in out.module_stderr)

tests/ansible/integration/become/sudo_password.yml

@@ -16,6 +16,7 @@
         that: |
           out.failed and (
             ('password is required' in out.msg) or
+            ('Missing sudo password' in out.msg) or
             ('password is required' in out.module_stderr)
           )