#397 fix avocado role to work on Fedora 33
Merged 4 years ago by astepano. Opened 4 years ago by bgoncalv.
bgoncalv/standard-test-roles fix-avocado-role  into  master

@@ -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

file modified
+2
@@ -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

no initial comment

rebased onto fc0adb6

4 years ago

Commit 4e1faa2 fixes this pull-request

Pull-Request has been merged by astepano

4 years ago

Pull-Request has been merged by astepano

4 years ago