From 92a531f331267c3413893f5e2b96fb71bd5b0599 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Jun 30 2017 21:33:39 +0000 Subject: update standard-test-selector role for Atomic Host --- diff --git a/roles/standard-test-selector/defaults/main.yml b/roles/standard-test-selector/defaults/main.yml index 31b2334..cc533ff 100644 --- a/roles/standard-test-selector/defaults/main.yml +++ b/roles/standard-test-selector/defaults/main.yml @@ -1,5 +1,7 @@ --- tests_docker: [] # input: tests to run only in docker container tests_not_docker: [] # input: tests to run only when not in docker +tests_atomic: [] # input: tests to run only in Atomic Host +tests_not_atomic: [] # input: tests to run only when not in Atomic Host tests_all: [] # input: tests to always run selected_tests: [] # output: list of selected tests diff --git a/roles/standard-test-selector/tasks/main.yml b/roles/standard-test-selector/tasks/main.yml index 88687c9..92f5cc1 100644 --- a/roles/standard-test-selector/tasks/main.yml +++ b/roles/standard-test-selector/tasks/main.yml @@ -17,3 +17,22 @@ set_fact: selected_tests: "{{ selected_tests }} + {{ tests_not_docker }}" when: docker_check_result|failed + +- name: Check if running in Atomic Host + shell: grep -q -i '^VARIANT.*atomic' /etc/os-release + register: atomic_check_result + ignore_errors: True + +- name: Add tests to run only when in Atomic Host + set_fact: + selected_tests: "{{ selected_tests }} + {{ tests_atomic }}" + when: atomic_check_result|succeeded + +- name: Add tests to run when not in Atomic Host + set_fact: + selected_tests: "{{ selected_tests }} + {{ tests_not_atomic }}" + when: atomic_check_result|failed + +- name: Make sure list of selected tests is unique + set_fact: + selected_tests: "{{ selected_tests | unique }}"