Skip tests for CentOS/RHEL 6

ansible · Jul 3, 2019 · 7f6fc68 · 7f6fc68
1 parent 9e32ccc
commit 7f6fc68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/test/integration/targets/setup_docker/defaults/main.yml b/test/integration/targets/setup_docker/defaults/main.yml
@@ -1,9 +1,10 @@
+docker_cli_version: '0.0'
+docker_api_version: '0.0'
+docker_py_version: '0.0'
+docker_prereq_packages: []
 docker_packages:
   - docker-ce
 
-docker_prereq_packages: []
-
+docker_pip_extra_packages: []
 docker_pip_packages:
   - docker
-
-docker_pip_extra_packages: []
diff --git a/...ion/targets/setup_docker/tasks/RedHat.yml → ...n/targets/setup_docker/tasks/RedHat-7.yml b/...ion/targets/setup_docker/tasks/RedHat.yml → ...n/targets/setup_docker/tasks/RedHat-7.yml
diff --git a/test/integration/targets/setup_docker/tasks/main.yml b/test/integration/targets/setup_docker/tasks/main.yml
@@ -1,4 +1,6 @@
-- block:
+- name: Setup Docker
+  when: ansible_facts.distribution ~ ansible_facts.distribution_major_version not in  ['CentOS6', 'RedHat6']
+  block:
     - name: Include distribution specific variables
       include_vars: "{{ lookup('first_found', params) }}"
       vars:
@@ -47,9 +49,9 @@
       ignore_errors: yes
 
     - set_fact:
-        docker_cli_version: "{{ (docker_cli_version_stdout.stdout | default('0.0')) or '0.0' }}"
-        docker_api_version: "{{ docker_api_version_stdout.stdout or '0.0' }}"
-        docker_py_version: "{{ docker_py_version_stdout.stdout or '0.0' }}"
+        docker_cli_version: "{{ docker_cli_version_stdout.stdout | default('0.0') }}"
+        docker_api_version: "{{ docker_api_version_stdout.stdout | default('0.0') }}"
+        docker_py_version: "{{ docker_py_version_stdout.stdout | default('0.0') }}"
 
     - debug:
         msg: "Docker CLI version: {{ docker_cli_version }}; Docker API version: {{ docker_api_version }}; docker-py library version: {{ docker_py_version }}"