From 06f4e470b4f3d1f2ff5f4ec5343717842af063e6 Mon Sep 17 00:00:00 2001 From: Marcel Mamula Date: Tue, 2 Sep 2025 09:36:05 +0200 Subject: [PATCH 1/4] linting fix for provision --- .github/workflows/ansible-lint-sap_vm_provision.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ansible-lint-sap_vm_provision.yml b/.github/workflows/ansible-lint-sap_vm_provision.yml index 10b8e85a..a3b9e9a7 100644 --- a/.github/workflows/ansible-lint-sap_vm_provision.yml +++ b/.github/workflows/ansible-lint-sap_vm_provision.yml @@ -31,15 +31,16 @@ jobs: - name: Set up Python 3 uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - name: Install test dependencies run: | - pip3 install ansible==9.1.0 - pip3 install ansible-compat==4.1.10 - pip3 install ansible-core==2.16.2 - pip3 install ansible-lint==6.22.1 - pip3 install jmespath==1.0.1 + pip3 install \ + ansible-core~=2.18.0 \ + ansible~=11.0.0 \ + ansible-lint~=25.1.0 \ + ansible-compat~=25.1.0 \ + jmespath~=1.0.0 - name: Install dependencies for Ansible run: ansible-galaxy collection install -r /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/requirements.yml From 6e3f9b6408a0c59dd3a60eaa50c55650bc7ac3e6 Mon Sep 17 00:00:00 2001 From: Marcel Mamula Date: Tue, 2 Sep 2025 10:21:18 +0200 Subject: [PATCH 2/4] restore skip items and update pip versions in actions --- .ansible-lint | 9 ++++----- ...ible-lint-sap_hypervisor_node_preconfigure.yml | 15 ++++++++------- .../ansible-lint-sap_vm_preconfigure.yml | 15 ++++++++------- .../workflows/ansible-lint-sap_vm_temp_vip.yml | 11 ++++++----- .github/workflows/ansible-lint-sap_vm_verify.yml | 12 ++++++------ .github/workflows/ansible-lint.yml | 15 ++++++++------- 6 files changed, 40 insertions(+), 37 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index 21b29859..62c36058 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -30,9 +30,8 @@ skip_list: - no-handler # Disable jinja formatting check - jinja[spacing] - - # Disabled skips, because they are not not required now. - # - yaml[comments] - # - yaml[line-length] - # - no-tabs + # Removing these skips would require refactoring of most roles + - yaml[comments] + - yaml[line-length] + - no-tabs # - var-naming[no-jinja] diff --git a/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml b/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml index bafd47dc..098a3034 100644 --- a/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml +++ b/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml @@ -24,19 +24,20 @@ jobs: steps: - name: Check out the code - uses: actions/checkout@main + uses: actions/checkout@v4 - name: Set up Python 3 - uses: actions/setup-python@main + uses: actions/setup-python@v5 with: - python-version: '3.9' + python-version: '3.13' - name: Install test dependencies run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 + pip3 install \ + ansible-core~=2.18.0 \ + ansible~=11.0.0 \ + ansible-lint~=25.1.0 \ + ansible-compat~=25.1.0 - name: Run ansible-lint working-directory: /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/roles/sap_hypervisor_node_preconfigure diff --git a/.github/workflows/ansible-lint-sap_vm_preconfigure.yml b/.github/workflows/ansible-lint-sap_vm_preconfigure.yml index 1470dd0d..2d2dec86 100644 --- a/.github/workflows/ansible-lint-sap_vm_preconfigure.yml +++ b/.github/workflows/ansible-lint-sap_vm_preconfigure.yml @@ -24,19 +24,20 @@ jobs: steps: - name: Check out the code - uses: actions/checkout@main + uses: actions/checkout@v4 - name: Set up Python 3 - uses: actions/setup-python@main + uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - name: Install test dependencies run: | - pip3 install ansible==9.1.0 - pip3 install ansible-compat==4.1.10 - pip3 install ansible-core==2.16.2 - pip3 install ansible-lint==6.22.1 + pip3 install \ + ansible-core~=2.18.0 \ + ansible~=11.0.0 \ + ansible-lint~=25.1.0 \ + ansible-compat~=25.1.0 - name: Run ansible-lint working-directory: /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/roles/sap_vm_preconfigure diff --git a/.github/workflows/ansible-lint-sap_vm_temp_vip.yml b/.github/workflows/ansible-lint-sap_vm_temp_vip.yml index f4603f56..c1874f8f 100644 --- a/.github/workflows/ansible-lint-sap_vm_temp_vip.yml +++ b/.github/workflows/ansible-lint-sap_vm_temp_vip.yml @@ -31,14 +31,15 @@ jobs: - name: Set up Python 3 uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - name: Install test dependencies run: | - pip3 install ansible==9.1.0 - pip3 install ansible-compat==4.1.10 - pip3 install ansible-core==2.16.2 - pip3 install ansible-lint==6.22.1 + pip3 install \ + ansible-core~=2.18.0 \ + ansible~=11.0.0 \ + ansible-lint~=25.1.0 \ + ansible-compat~=25.1.0 - name: Run ansible-lint working-directory: /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/roles/sap_vm_temp_vip diff --git a/.github/workflows/ansible-lint-sap_vm_verify.yml b/.github/workflows/ansible-lint-sap_vm_verify.yml index 2e279dce..f1ce5ee8 100644 --- a/.github/workflows/ansible-lint-sap_vm_verify.yml +++ b/.github/workflows/ansible-lint-sap_vm_verify.yml @@ -31,15 +31,15 @@ jobs: - name: Set up Python 3 uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - name: Install test dependencies run: | - pip3 install ansible==9.1.0 - pip3 install ansible-compat==4.1.10 - pip3 install ansible-core==2.16.2 - pip3 install ansible-lint==6.22.1 - pip3 install jmespath==1.0.1 + pip3 install \ + ansible-core~=2.18.0 \ + ansible~=11.0.0 \ + ansible-lint~=25.1.0 \ + ansible-compat~=25.1.0 - name: Run ansible-lint working-directory: /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/roles/sap_vm_verify diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index 2ac44bea..3f97686b 100644 --- a/.github/workflows/ansible-lint.yml +++ b/.github/workflows/ansible-lint.yml @@ -21,15 +21,16 @@ jobs: - name: Set up Python 3 uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - - name: Install dependencies for Python + - name: Install test dependencies run: | - pip3 install ansible==9.1.0 - pip3 install ansible-compat==4.1.10 - pip3 install ansible-core==2.16.2 - pip3 install ansible-lint==6.22.1 - pip3 install jmespath==1.0.1 + pip3 install \ + ansible-core~=2.18.0 \ + ansible~=11.0.0 \ + ansible-lint~=25.1.0 \ + ansible-compat~=25.1.0 \ + jmespath~=1.0.0 - name: Install dependencies for Ansible run: ansible-galaxy collection install -r /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/requirements.yml From b03dbad0e09e6534058e6c6394a0461a2c70c764 Mon Sep 17 00:00:00 2001 From: Marcel Mamula Date: Tue, 2 Sep 2025 10:30:47 +0200 Subject: [PATCH 3/4] remove trailing space from config --- .ansible-lint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ansible-lint b/.ansible-lint index 62c36058..1dbba4a8 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -30,7 +30,7 @@ skip_list: - no-handler # Disable jinja formatting check - jinja[spacing] - # Removing these skips would require refactoring of most roles + # Removing these skips would require refactoring of most roles - yaml[comments] - yaml[line-length] - no-tabs From d261a1b71e368d6e1b561def511cfbaa734aae26 Mon Sep 17 00:00:00 2001 From: Marcel Mamula Date: Tue, 2 Sep 2025 10:44:44 +0200 Subject: [PATCH 4/4] add missing workflow_dispatch to enable run button --- .../workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml | 2 ++ .github/workflows/ansible-lint-sap_vm_preconfigure.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml b/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml index 098a3034..3485dabc 100644 --- a/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml +++ b/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml @@ -18,6 +18,8 @@ on: paths: - 'roles/sap_hypervisor_node_preconfigure/**' + workflow_dispatch: + jobs: ansible-lint: runs-on: ubuntu-latest diff --git a/.github/workflows/ansible-lint-sap_vm_preconfigure.yml b/.github/workflows/ansible-lint-sap_vm_preconfigure.yml index 2d2dec86..73813f50 100644 --- a/.github/workflows/ansible-lint-sap_vm_preconfigure.yml +++ b/.github/workflows/ansible-lint-sap_vm_preconfigure.yml @@ -18,6 +18,8 @@ on: paths: - 'roles/sap_vm_preconfigure/**' + workflow_dispatch: + jobs: ansible-lint: runs-on: ubuntu-latest