From 1f992d1b61e619cbc7c9f2c2334f94c9e50651d0 Mon Sep 17 00:00:00 2001 From: Andrei Stepanov Date: Jul 08 2019 11:19:01 +0000 Subject: Use /usr/bin/python3 for Fedora >= 30 --- diff --git a/roles/standard-test-source/tasks/main.yml b/roles/standard-test-source/tasks/main.yml index d52f78b..2e53ff9 100644 --- a/roles/standard-test-source/tasks/main.yml +++ b/roles/standard-test-source/tasks/main.yml @@ -15,8 +15,15 @@ ansible_python_interpreter: /usr/bin/python3 # lookup() - runs always on test-runner when: - - lookup('file', '/etc/os-release') | regex_search("^ID=\"*rhel", multiline=True) - - lookup('file', '/etc/os-release') | regex_search("^VERSION_ID=\"*8", multiline=True) + ( + (lookup('file', '/etc/os-release') | regex_search("^ID=\"*rhel", multiline=True)) + and + (lookup('file', '/etc/os-release') | regex_search("^VERSION_ID=\"*8", multiline=True)) + ) or ( + (lookup('file', '/etc/os-release') | regex_search("^ID=\"*fedora", multiline=True)) + and + (lookup('file', '/etc/os-release') | regex_search("^VERSION_ID=\"*[^2][0-9]", multiline=True)) + ) - name: Gather facts setup: diff --git a/roles/str-common-init/tasks/trunner.yml b/roles/str-common-init/tasks/trunner.yml index 860f60f..ae739b3 100644 --- a/roles/str-common-init/tasks/trunner.yml +++ b/roles/str-common-init/tasks/trunner.yml @@ -12,8 +12,15 @@ ansible_python_interpreter: /usr/bin/python3 # lookup() - runs always on test-runner when: - - lookup('file', '/etc/os-release') | regex_search("^ID=\"*rhel", multiline=True) - - lookup('file', '/etc/os-release') | regex_search("^VERSION_ID=\"*8", multiline=True) + ( + (lookup('file', '/etc/os-release') | regex_search("^ID=\"*rhel", multiline=True)) + and + (lookup('file', '/etc/os-release') | regex_search("^VERSION_ID=\"*8", multiline=True)) + ) or ( + (lookup('file', '/etc/os-release') | regex_search("^ID=\"*fedora", multiline=True)) + and + (lookup('file', '/etc/os-release') | regex_search("^VERSION_ID=\"*[^2][0-9]", multiline=True)) + ) - name: Gather facts from test-runner setup: