Fixing bugs in conditional testing with until and some integration runner tweaks

test/utils/ansible-playbook_integration_runner/main.yml

@@ -74,4 +74,4 @@
 
     - name: Fail
       shell: 'echo "{{ inventory_hostname }}, Failed" && exit 1'
-      when: "test_results.rc != 0"
+      when: "'rc' not in test_results or test_results.rc != 0"

test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/tasks/main.yml

@@ -59,6 +59,7 @@
   when: ansible_os_family == 'Debian'
 
 - name: update ca certificates
+  sudo: true
   yum: name=ca-certificates state=latest
   when: ansible_os_family == 'RedHat'
 

test/utils/ansible-playbook_integration_runner/roles/run_integration/tasks/main.yml

@@ -6,10 +6,12 @@
 
 - name: Get ansible source dir
   sudo: false
-  shell: "cd ~ && pwd"
+  shell: "cd ~/ansible && pwd"
   register: results
 
-- shell: ". hacking/env-setup && cd test/integration && make {{ run_integration_make_target }}"
+- shell: "ls -la && . hacking/env-setup && cd test/integration && make {{ run_integration_make_target }}"
+  args:
+    chdir: "{{ results.stdout }}"
   async: 3600
   poll: 0
   register: async_test_results
@@ -17,14 +19,13 @@
   environment:
     TEST_FLAGS: "{{ run_integration_test_flags|default(lookup('env', 'TEST_FLAGS')) }}"
     CREDENTIALS_FILE: "{{ run_integration_credentials_file|default(lookup('env', 'CREDENTIALS_FILE')) }}"
-  args:
-    chdir: "{{ results.stdout }}/ansible"
 
 - name: poll for test results
-  async_status:
-    jid: "{{async_test_results.ansible_job_id}}"
+  async_status: jid="{{async_test_results.ansible_job_id}}"
   register: test_results
   until: test_results.finished
-  retries: 360
-  delay: 10
+  retries: 120
+  delay: 30
   ignore_errors: true
+
+- debug: var=test_results