integration-playbook: Increase test timeout

Depending on circumstances out of our control, the 'integration tests'
may take longer than an hour (3600 seconds).  Since the maximum time
is referenced in several places, define a variable with a larger value
then reference it from the affected tasks.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2017-09-20 16:34:03 -04:00
parent e6b5fc7d53
commit 78c400ccd3

View file

@ -7,6 +7,7 @@
vars: vars:
xunit: false xunit: false
cni_commit: dcf7368eeab15e2affc6256f0bb1e84dd46a34de cni_commit: dcf7368eeab15e2affc6256f0bb1e84dd46a34de
integration_timeout_seconds: "{{ 60 * 60 * 2 }}"
pre_tasks: pre_tasks:
# Assumes subscription stuff won't get in the way # Assumes subscription stuff won't get in the way
- name: Install pre-requesites for ansible on all platforms - name: Install pre-requesites for ansible on all platforms
@ -337,7 +338,7 @@
shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration 2>&1 > testout.txt' shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration 2>&1 > testout.txt'
args: args:
chdir: /root/src/github.com/kubernetes-incubator/cri-o chdir: /root/src/github.com/kubernetes-incubator/cri-o
async: 3600 async: "{{ integration_timeout_seconds | int }}"
poll: 10 poll: 10
ignore_errors: yes ignore_errors: yes
when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS' when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
@ -345,7 +346,7 @@
shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration' shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration'
args: args:
chdir: /root/src/github.com/kubernetes-incubator/cri-o chdir: /root/src/github.com/kubernetes-incubator/cri-o
async: 3600 async: "{{ integration_timeout_seconds | int }}"
poll: 10 poll: 10
ignore_errors: yes ignore_errors: yes
when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and xunit when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and xunit
@ -353,7 +354,7 @@
shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2" make localintegration 2>&1 > testout.txt' shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2" make localintegration 2>&1 > testout.txt'
args: args:
chdir: /root/src/github.com/kubernetes-incubator/cri-o chdir: /root/src/github.com/kubernetes-incubator/cri-o
async: 3600 async: "{{ integration_timeout_seconds | int }}"
poll: 10 poll: 10
ignore_errors: yes ignore_errors: yes
when: ansible_distribution == 'Fedora' when: ansible_distribution == 'Fedora'
@ -361,7 +362,7 @@
shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2" make localintegration' shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2" make localintegration'
args: args:
chdir: /root/src/github.com/kubernetes-incubator/cri-o chdir: /root/src/github.com/kubernetes-incubator/cri-o
async: 3600 async: "{{ integration_timeout_seconds | int }}"
poll: 10 poll: 10
ignore_errors: yes ignore_errors: yes
when: (ansible_distribution == 'Fedora' and xunit) when: (ansible_distribution == 'Fedora' and xunit)