From 4a9236cca906fdeb55221b177f4d62a08da23668 Mon Sep 17 00:00:00 2001 From: Marcel Mamula Date: Fri, 8 Aug 2025 13:20:29 +0200 Subject: [PATCH 1/3] update sles 15 vars for 2.19 --- roles/sap_software_download/vars/SLES_15.yml | 37 ++++++++++---------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/roles/sap_software_download/vars/SLES_15.yml b/roles/sap_software_download/vars/SLES_15.yml index 5932303..63d4050 100644 --- a/roles/sap_software_download/vars/SLES_15.yml +++ b/roles/sap_software_download/vars/SLES_15.yml @@ -25,21 +25,22 @@ __sap_software_download_python_package: >- # The list of required Python Modules in packages # This is required in order to avoid externally-managed-environment error. -__sap_software_download_python_module_packages: >- - {%- if ansible_distribution_version.split('.')[1] | int < 5 -%} - [ - "python3-wheel", - "python3-urllib3", - "python3-requests", - "python3-beautifulsoup4", - "python3-lxml" - ] - {%- else -%} - [ - "python311-wheel", - "python311-urllib3", - "python311-requests", - "python311-beautifulsoup4", - "python311-lxml" - ] - {%- endif -%} +__sap_software_download_python_module_packages: + "{{ __sap_software_download_python_module_packages_3 + if ansible_distribution_version.split('.')[1] | int < 5 + else __sap_software_download_python_module_packages_311 }}" + +# The lists of Python Modules for specific python version +__sap_software_download_python_module_packages_3: + - "python3-wheel" + - "python3-urllib3" + - "python3-requests" + - "python3-beautifulsoup4" + - "python3-lxml" + +__sap_software_download_python_module_packages_311: + - "python311-wheel" + - "python311-urllib3" + - "python311-requests" + - "python311-beautifulsoup4" + - "python311-lxml" From 3197861ca6c77c174a8ad0c2b2dae787d75c8dee Mon Sep 17 00:00:00 2001 From: Marcel Mamula Date: Fri, 8 Aug 2025 13:35:23 +0200 Subject: [PATCH 2/3] fix outdated ansible-lint action --- .github/workflows/ansible-lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index d9da0a8..b55e812 100644 --- a/.github/workflows/ansible-lint.yml +++ b/.github/workflows/ansible-lint.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Ansible Lint Action - uses: ansible-community/ansible-lint-action@v6.0.2 + uses: ansible/ansible-lint@v6 From 5a22d9a77af22041c6c510e833f992b5b356df9c Mon Sep 17 00:00:00 2001 From: Marcel Mamula Date: Fri, 8 Aug 2025 14:15:52 +0200 Subject: [PATCH 3/3] fix linting errors after action update --- .../tasks/pre_steps/05_validate_relations.yml | 6 ++++-- roles/sap_software_download/vars/SLES_15.yml | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/sap_software_download/tasks/pre_steps/05_validate_relations.yml b/roles/sap_software_download/tasks/pre_steps/05_validate_relations.yml index 39c9687..b16b988 100644 --- a/roles/sap_software_download/tasks/pre_steps/05_validate_relations.yml +++ b/roles/sap_software_download/tasks/pre_steps/05_validate_relations.yml @@ -71,8 +71,10 @@ - name: Relationship Validation - Define list of files ansible.builtin.set_fact: - __sap_software_download_files: "{{ sap_software_download_files if not sap_software_download_find_alternatives - else __sap_software_download_files_results_dryrun.results | selectattr('failed', 'false')| map(attribute='filename') | list | unique | d([])}}" + __sap_software_download_files: + "{{ sap_software_download_files + if not sap_software_download_find_alternatives + else __sap_software_download_files_results_dryrun.results | selectattr('failed', 'false') | map(attribute='filename') | list | unique | d([]) }}" - name: Relationship Validation - SAP HANA - Multiple IMDB_SERVER files found diff --git a/roles/sap_software_download/vars/SLES_15.yml b/roles/sap_software_download/vars/SLES_15.yml index 63d4050..d5d9681 100644 --- a/roles/sap_software_download/vars/SLES_15.yml +++ b/roles/sap_software_download/vars/SLES_15.yml @@ -26,9 +26,9 @@ __sap_software_download_python_package: >- # The list of required Python Modules in packages # This is required in order to avoid externally-managed-environment error. __sap_software_download_python_module_packages: - "{{ __sap_software_download_python_module_packages_3 - if ansible_distribution_version.split('.')[1] | int < 5 - else __sap_software_download_python_module_packages_311 }}" + "{{ __sap_software_download_python_module_packages_3 + if ansible_distribution_version.split('.')[1] | int < 5 + else __sap_software_download_python_module_packages_311 }}" # The lists of Python Modules for specific python version __sap_software_download_python_module_packages_3: