-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci: bump ansible-lint to v25; provide collection requirements for ans…
…ible-lint There is a new version of ansible-lint - v25. Newer versions of ansible-lint require the collection requirements to be installed so it can find the modules/plugins. Enhance our ansible-lint ci job to provide the collection requirements, including merging the runtime meta/collection-requirements.yml with the testing tests/collection-requirements.yml. This should somewhat mitigate the loss of ansible-plugin-scan. We have to remove mock_modules that are actually present now. Signed-off-by: Rich Megginson <[email protected]>
- Loading branch information
Showing
2 changed files
with
34 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,15 +35,48 @@ jobs: | |
pip3 install "git+https://github.com/linux-system-roles/[email protected]" | ||
- name: Convert role to collection format | ||
id: collection | ||
run: | | ||
set -euxo pipefail | ||
TOXENV=collection lsr_ci_runtox | ||
coll_dir=".tox/ansible_collections/$LSR_ROLE2COLL_NAMESPACE/$LSR_ROLE2COLL_NAME" | ||
# cleanup after collection conversion | ||
rm -rf "$coll_dir/.ansible" .tox/ansible-plugin-scan | ||
# ansible-lint action requires a .git directory??? | ||
# https://github.com/ansible/ansible-lint/blob/main/action.yml#L45 | ||
mkdir -p "$coll_dir/.git" | ||
meta_req_file="${{ github.workspace }}/meta/collection-requirements.yml" | ||
test_req_file="${{ github.workspace }}/tests/collection-requirements.yml" | ||
if [ -f "$meta_req_file" ] && [ -f "$test_req_file" ]; then | ||
coll_req_file="${{ github.workspace }}/req.yml" | ||
python -c 'import sys; import yaml | ||
hsh1 = yaml.safe_load(open(sys.argv[1])) | ||
hsh2 = yaml.safe_load(open(sys.argv[2])) | ||
coll = {} | ||
for item in hsh1["collections"] + hsh2["collections"]: | ||
if isinstance(item, dict): | ||
name = item["name"] | ||
rec = item | ||
else: | ||
name = item # assume string | ||
rec = {"name": name} | ||
if name not in coll: | ||
coll[name] = rec | ||
hsh1["collections"] = list(coll.values()) | ||
yaml.safe_dump(hsh1, open(sys.argv[3], "w"))' "$meta_req_file" "$test_req_file" "$coll_req_file" | ||
echo merged "$coll_req_file" | ||
cat "$coll_req_file" | ||
elif [ -f "$meta_req_file" ]; then | ||
coll_req_file="$meta_req_file" | ||
elif [ -f "$test_req_file" ]; then | ||
coll_req_file="$test_req_file" | ||
else | ||
coll_req_file="" | ||
fi | ||
echo "coll_req_file=$coll_req_file" >> $GITHUB_OUTPUT | ||
- name: Run ansible-lint | ||
uses: ansible/ansible-lint@v24 | ||
uses: ansible/ansible-lint@v25 | ||
with: | ||
working_directory: ${{ github.workspace }}/.tox/ansible_collections/${{ env.LSR_ROLE2COLL_NAMESPACE }}/${{ env.LSR_ROLE2COLL_NAME }} | ||
requirements_file: ${{ steps.collection.outputs.coll_req_file }} |