From 870049523fa6d8c1bb2dc069a8f889881f1c2d4a Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Tue, 28 May 2024 13:18:26 +0200 Subject: [PATCH] collection support: use manifest instead of excludes The default for galaxy. `manifest` works well enough for our case, and this avoids maintaining a blacklist. --- .pre-commit-config.yaml | 2 ++ galaxy.yml | 40 +++++----------------------------------- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5bba7e7ea..a8248022e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,6 +43,7 @@ repos: - jsonschema==4.22.0 - jmespath==1.0.1 - netaddr==1.2.1 + - distlib - repo: https://github.com/VannTen/misspell # Waiting on https://github.com/golangci/misspell/pull/19 to get merged @@ -80,6 +81,7 @@ repos: language: python additional_dependencies: - ansible-core>=2.16.4 + - distlib entry: tests/scripts/collection-build-install.sh pass_filenames: false diff --git a/galaxy.yml b/galaxy.yml index d67640320..dcef52496 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -9,42 +9,12 @@ authors: tags: - infrastructure repository: https://github.com/kubernetes-sigs/kubespray +issues: https://github.com/kubernetes-sigs/kubespray/issues +documentation: https://kubespray.io license_file: LICENSE dependencies: ansible.utils: '>=2.5.0' community.general: '>=3.0.0' -build_ignore: - - .github - - '*.tar.gz' - - extra_playbooks - - inventory - - scripts - - test-infra - - .ansible-lint - - .editorconfig - - .gitignore - - .gitlab-ci - - .gitlab-ci.yml - - .gitmodules - - .markdownlint.yaml - - .nojekyll - - .pre-commit-config.yaml - - .yamllint - - Dockerfile - - FILES.json - - MANIFEST.json - - Makefile - - Vagrantfile - - _config.yml - - ansible.cfg - - requirements*txt - - setup.cfg - - setup.py - - index.html - - reset.yml - - cluster.yml - - scale.yml - - recover-control-plane.yml - - remove-node.yml - - upgrade-cluster.yml - - library +manifest: + directives: + - recursive-exclude tests **