diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63c96ef70fa..b0b5ca2e5e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,8 +15,10 @@ jobs: include: - name: centos-stream-8 container-name: el8stream + pip-command: pip3.8 - name: centos-stream-9 container-name: el9stream + pip-command: pip3 name: ${{ matrix.name }} @@ -27,6 +29,9 @@ jobs: image: quay.io/ovirt/buildcontainer:${{ matrix.container-name }} steps: + - name: Install required PyPI packages + run: ${{ matrix.pip-command }} install "ansible-lint>=6.0.0,<7.0.0" + - name: Checkout sources uses: ovirt/checkout-action@main diff --git a/build/ansible-check.sh b/build/ansible-check.sh index b1b97899e06..f90203433d5 100755 --- a/build/ansible-check.sh +++ b/build/ansible-check.sh @@ -1,27 +1,12 @@ #!/bin/sh -x -# Search for playbooks within specified directories (one level only) -PLABOOKS_DIR="packaging/ansible-runner-service-project/project" - -# Directory with roles -ROLES_DIR="packaging/ansible-runner-service-project/project/roles" - -SRCDIR="$(dirname "$0")/.." - -ANSIBLE_LINT=/usr/bin/ansible-lint ANSIBLE_LINT_CONF="$(dirname "$0")/ansible-lint.conf" -if ! which "${ANSIBLE_LINT}" > /dev/null 2>&1; then - echo "WARNING: tool '${ANSIBLE_LINT}' is missing" >&2 +# Check if the ansible-lint binary exists +if ! command -v ansible-lint > /dev/null 2>&1; then + echo "WARNING: tool 'ansible-lint' is missing" >&2 exit 0 fi -cd "${SRCDIR}" - -# Find playbooks -PARAMS=$(find ${PLABOOKS_DIR} -type f -name '*.yml' -maxdepth 1) - -# Find roles -PARAMS="$PARAMS $(find ${ROLES_DIR} -type d -maxdepth 1)" - -${ANSIBLE_LINT} -c ${ANSIBLE_LINT_CONF} ${PARAMS} +# Run ansible-lint +ansible-lint -c ${ANSIBLE_LINT_CONF} packaging/ansible-runner-service-project/project/roles/*