From 37ff79229bf19d8bf97aebd701ac7aa5eac89178 Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Tue, 28 Apr 2020 13:40:30 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=97=20Image=20tests=20for=20Fedora=203?= =?UTF-8?q?2=20+=20RHEL=208.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable image tests for Fedora 31 and RHEL 8.2 since we now have the JSON test case files for all distributions. Signed-off-by: Major Hayden --- jenkins/test_runner_image.yml | 13 +++++++++++-- jenkins/vars.yml | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jenkins/test_runner_image.yml b/jenkins/test_runner_image.yml index f6f3cc986..e3e970d88 100644 --- a/jenkins/test_runner_image.yml +++ b/jenkins/test_runner_image.yml @@ -1,5 +1,14 @@ --- +- name: Setup test case prefix based on distro and release + set_fact: + test_case_prefix: >- + {%- if ansible_distribution == "Fedora" -%} + fedora_{{ ansible_distribution_version }}-{{ ansible_machine }} + {%- else -%} + rhel_{{ ansible_distribution_version }}-{{ ansible_machine }} + {%- endif -%} + - name: Show which tests will be run debug: msg: | @@ -18,9 +27,9 @@ {{ image_test_executable }} -test.v \ {% for test_case in osbuild_composer_image_test_cases %} {% if loop.last %} - {{ image_test_case_path }}/{{ test_case }} + {{ image_test_case_path }}/{{ test_case_prefix }}-{{ test_case }} {% else %} - {{ image_test_case_path }}/{{ test_case }} \ + {{ image_test_case_path }}/{{ test_case_prefix }}-{{ test_case }} \ {% endif %} {% endfor %} args: diff --git a/jenkins/vars.yml b/jenkins/vars.yml index d2a99cf35..15c07dcc7 100644 --- a/jenkins/vars.yml +++ b/jenkins/vars.yml @@ -33,5 +33,5 @@ image_test_case_path: /usr/share/tests/osbuild-composer/cases # List of image tests and their timeouts (in minutes). osbuild_composer_image_test_cases: - - fedora_31-x86_64-ext4_filesystem-boot.json - - fedora_31-x86_64-tar-boot.json + - ext4_filesystem-boot.json + - tar-boot.json