From bd3f4946bb6940f34077a252cefb4af0640d9ba8 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 29 Aug 2023 09:12:48 +0100 Subject: [PATCH] Define lint_pip_dependencies for stackhpc.hashicorp collection lint This ensures we install the hashivault modules required to make the linting pass. --- ansible/inventory/group_vars/all/source-repositories | 2 ++ .../roles/source-repo-sync/templates/lint-collection.jinja | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/ansible/inventory/group_vars/all/source-repositories b/ansible/inventory/group_vars/all/source-repositories index 720714ba..907536fb 100644 --- a/ansible/inventory/group_vars/all/source-repositories +++ b/ansible/inventory/group_vars/all/source-repositories @@ -545,6 +545,8 @@ source_repositories: ansible-collection-hashicorp: repository_type: "ansible" workflows: "{{ ansible_workflows.collection }}" + workflow_args: + lint_pip_dependencies: "git+https://github.com/stackhpc/ansible-modules-hashivault@stackhpc" community_files: - codeowners: content: "{{ community_files.codeowners.ansible }}" diff --git a/ansible/roles/source-repo-sync/templates/lint-collection.jinja b/ansible/roles/source-repo-sync/templates/lint-collection.jinja index 1cda5e64..6a8a98ed 100644 --- a/ansible/roles/source-repo-sync/templates/lint-collection.jinja +++ b/ansible/roles/source-repo-sync/templates/lint-collection.jinja @@ -5,3 +5,7 @@ name: Ansible collection linters jobs: lint: uses: stackhpc/.github/.github/workflows/lint-collection.yml@main +{% if workflow_manifest.workflow_args.lint_pip_dependencies is defined %} + with: + upstream: {{ workflow_manifest.workflow_args.lint_pip_dependencies }} +{% endif %}