From 082499907cb0f0808666e891efcafa2fcf47d577 Mon Sep 17 00:00:00 2001 From: Bruno Goncalves Date: Jun 11 2018 13:27:59 +0000 Subject: makefile is not required for beakerlib role --- diff --git a/roles/standard-test-beakerlib/defaults/main.yml b/roles/standard-test-beakerlib/defaults/main.yml index a6d16f3..2c20da5 100644 --- a/roles/standard-test-beakerlib/defaults/main.yml +++ b/roles/standard-test-beakerlib/defaults/main.yml @@ -7,6 +7,9 @@ beakerlib_pkgs_req: fedora: - python2-lxml +makefile_pkgs_req1: [] +makefile_pkgs_req2: [] + # This care about this lists will take str-common-init role_pkgs_req: - beakerlib diff --git a/roles/standard-test-beakerlib/files/resolve-test-dependencies b/roles/standard-test-beakerlib/files/resolve-test-dependencies index 79f130a..80f0eb7 100755 --- a/roles/standard-test-beakerlib/files/resolve-test-dependencies +++ b/roles/standard-test-beakerlib/files/resolve-test-dependencies @@ -79,7 +79,7 @@ done TEST=$1 [ -z "$TEST" ] && exit_error "No test specified" -[ -f "$TEST/Makefile" ] || exit_error "Makefile not found @ $TEST/Makefile" +[ -f "$TEST/Makefile" ] || exit 0 REQUIRES_DEPS= RHTSREQUIRES_DEPS= diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml index d6c050b..a92dbde 100644 --- a/roles/standard-test-beakerlib/tasks/main.yml +++ b/roles/standard-test-beakerlib/tasks/main.yml @@ -15,6 +15,7 @@ makefile_pkgs_req1: "{{ deps.results[0].stdout_lines[0].split()|d([], true) }}" # Requires in Makefile makefile_pkgs_req2: "{{ deps.results[0].stdout_lines[1].split()|d([], true) }}" + when: deps.results[0].stdout_lines | length > 1 - debug: msg: >