diff --git a/meta/main.yml b/meta/main.yml index d7f8945..f608629 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -4,7 +4,7 @@ galaxy_info: namespace: rakestraw author: Eric Rakestraw description: Install and configure Notarius from source - license: BSD-3-Clause + license: CC0-1.0 min_ansible_version: "2.18" issue_tracker_url: https://gitea.maximumdirect.net/eric/ansible-role-notarius/issues platforms: diff --git a/tests/integration b/tests/integration index bfec83d..65ca766 100755 --- a/tests/integration +++ b/tests/integration @@ -90,7 +90,12 @@ run_converge "$missing_binary_repeat_log" require_clean_recap "$missing_binary_repeat_log" custom_go_binary="$test_tmp/go" -ln -s /snap/bin/go "$custom_go_binary" +custom_go_invocation_log="$test_tmp/custom-go-invocation.log" +printf '%s\n' \ + '#!/usr/bin/env bash' \ + "printf 'invoked\\n' >> '$custom_go_invocation_log'" \ + 'exec /snap/bin/go "$@"' > "$custom_go_binary" +chmod 0755 "$custom_go_binary" sudo rm -f -- "$binary_path" custom_go_log="$test_tmp/custom-go.log" run_converge "$custom_go_log" \ @@ -98,6 +103,7 @@ run_converge "$custom_go_log" \ -e "notarius_go_binary=$custom_go_binary" require_changed_recap "$custom_go_log" grep -A1 -E 'TASK .*Build Notarius' "$custom_go_log" | grep -q '^changed:' +[[ -s "$custom_go_invocation_log" ]] custom_go_repeat_log="$test_tmp/custom-go-repeat.log" run_converge "$custom_go_repeat_log" \ -e '{"notarius_manage_build_dependencies":false}' \