From fc0adb6eb14725af3ddcb8c402e352d091553f75 Mon Sep 17 00:00:00 2001
From: Bruno Goncalves <bgoncalv@redhat.com>
Date: Dec 08 2020 09:03:37 +0000
Subject: fix avocado role to work on Fedora 33


---

diff --git a/roles/standard-test-avocado/tasks/main.yml b/roles/standard-test-avocado/tasks/main.yml
index e3a3953..30b0c9d 100644
--- a/roles/standard-test-avocado/tasks/main.yml
+++ b/roles/standard-test-avocado/tasks/main.yml
@@ -2,10 +2,19 @@
 - name: Set avocado package name
   set_fact:
     avocado_rpm: python2-avocado
+    python_version: python2
 
 - name: Set avocado package name for Fedora releases > 30
   set_fact:
     avocado_rpm: python3-avocado
+    python_version: python3
+  when:
+    - ansible_distribution == "Fedora"
+    - ansible_distribution_major_version > "30"
+
+- name: Enable avocado module for Fedora releases > 30
+  shell: >
+    dnf module enable -y avocado
   when:
     - ansible_distribution == "Fedora"
     - ansible_distribution_major_version > "30"
@@ -38,7 +47,7 @@
   - name: Execute the avocado test
     shell: >
       exec 2>>{{ remote_artifacts }}/test.log 1>>{{ remote_artifacts }}/test.log;
-      MODULE=rpm python -m avocado run --job-results-dir {{ remote_artifacts }}/ {{tests|join(' ') }}
+      MODULE=rpm {{ python_version }} -m avocado run --job-results-dir {{ remote_artifacts }}/ {{tests|join(' ') }}
 
   always:
   - name: Pull out the logs
diff --git a/tests/avocado.yml b/tests/avocado.yml
index 846cd8c..23f0abf 100644
--- a/tests/avocado.yml
+++ b/tests/avocado.yml
@@ -22,3 +22,5 @@
           (test_log.find('/bin/true:  PASS') == -1)
       # We should fail when we can not find FAIL string on log
       # -1 means string not found
+    - import_tasks: shared-tasks/artifacts_test_env.yml
+    - import_tasks: shared-tasks/artifacts_test_runner.yml