diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index b931ee95..22cb0b05 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -60,7 +60,7 @@ jobs: --output ${{ env.RELEASE_VERSION }}/README.html README.md - name: Upload docs HTML artifact - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: name: docs-html path: ${{ env.RELEASE_VERSION }}/README.html diff --git a/.github/workflows/changelog_to_tag.yml b/.github/workflows/changelog_to_tag.yml index 7585dea7..11acf57a 100644 --- a/.github/workflows/changelog_to_tag.yml +++ b/.github/workflows/changelog_to_tag.yml @@ -79,7 +79,7 @@ jobs: - name: Create Release id: create_release - uses: ncipollo/release-action@339a81892b84b4eeb0f6e744e4574d79d0d9b8dd # v1 + uses: ncipollo/release-action@339a81892b84b4eeb0f6e744e4574d79d0d9b8dd # v1.21.0 with: tag: ${{ steps.tag.outputs.tagname }} name: Version ${{ steps.tag.outputs.tagname }} diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index ad20387e..2cffe773 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -18,4 +18,4 @@ jobs: persist-credentials: false - name: Codespell - uses: codespell-project/actions-codespell@8f01853be192eb0f849a5c7d721450e7a467c579 # v2 + uses: codespell-project/actions-codespell@8f01853be192eb0f849a5c7d721450e7a467c579 # v2.2 diff --git a/.github/workflows/qemu-kvm-integration-tests.yml b/.github/workflows/qemu-kvm-integration-tests.yml index d8bcd3de..86a0d0ce 100644 --- a/.github/workflows/qemu-kvm-integration-tests.yml +++ b/.github/workflows/qemu-kvm-integration-tests.yml @@ -130,7 +130,7 @@ jobs: - name: Ensure use of podman 5 if: steps.check_platform.outputs.supported && steps.check_podman_version.outputs.need_podman_update == 1 - uses: redhat-actions/podman-install@3b6c60c447c93960c0b76faa0c66c6694bc71350 # main + uses: redhat-actions/podman-install@0499d3899e6b92f60548b38421893a7f8ba4bd07 # main - name: Configure tox-lsr if: steps.check_platform.outputs.supported @@ -214,7 +214,7 @@ jobs: - name: Upload test logs on failure if: failure() - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: name: "logs-${{ matrix.scenario.image }}-${{ matrix.scenario.env }}" path: | diff --git a/.github/workflows/test_converting_readme.yml b/.github/workflows/test_converting_readme.yml index bce11fba..bec9e2cb 100644 --- a/.github/workflows/test_converting_readme.yml +++ b/.github/workflows/test_converting_readme.yml @@ -45,7 +45,7 @@ jobs: --output README.html README.md - name: Upload README.html as an artifact - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: name: README.html path: README.html diff --git a/.github/workflows/tft.yml b/.github/workflows/tft.yml index 802de10e..fce81246 100644 --- a/.github/workflows/tft.yml +++ b/.github/workflows/tft.yml @@ -158,7 +158,7 @@ jobs: targetUrl: "" - name: Run test in testing farm - uses: sclorg/testing-farm-as-github-action@230555baceb860aa468d216f1822974836b965d1 # v4 + uses: sclorg/testing-farm-as-github-action@230555baceb860aa468d216f1822974836b965d1 # v4.3.1 if: contains(needs.prepare_vars.outputs.supported_platforms, matrix.platform) with: git_ref: main diff --git a/defaults/main.yml b/defaults/main.yml index 0392eac2..e4efb9d7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -164,4 +164,10 @@ __logging_is_rh_distro: "{{ ansible_facts['distribution'] in __logging_rh_distro # Use this in conditionals to check if distro is Red Hat or clone, or Fedora __logging_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __logging_rh_distros_fedora }}" + +# Use these in conditionals to check if distro is Red Hat or clone of a specific major version +__logging_is_rh_distro_7: "{{ __logging_is_rh_distro and ansible_facts['distribution_major_version'] == '7' }}" +__logging_is_rh_distro_8: "{{ __logging_is_rh_distro and ansible_facts['distribution_major_version'] == '8' }}" +__logging_is_rh_distro_9: "{{ __logging_is_rh_distro and ansible_facts['distribution_major_version'] == '9' }}" +__logging_is_rh_distro_10: "{{ __logging_is_rh_distro and ansible_facts['distribution_major_version'] == '10' }}" # END - DO NOT EDIT THIS BLOCK - rh distros variables diff --git a/meta/collection-requirements.yml b/meta/collection-requirements.yml index 8896293e..bf556898 100644 --- a/meta/collection-requirements.yml +++ b/meta/collection-requirements.yml @@ -2,5 +2,4 @@ --- collections: - name: ansible.posix - version: '>=2.1.0,<2.2.0' - name: fedora.linux_system_roles diff --git a/tests/vars/rh_distros_vars.yml b/tests/vars/rh_distros_vars.yml index 83fe0d4d..fac986aa 100644 --- a/tests/vars/rh_distros_vars.yml +++ b/tests/vars/rh_distros_vars.yml @@ -18,3 +18,9 @@ __logging_is_rh_distro: "{{ ansible_facts['distribution'] in __logging_rh_distro # Use this in conditionals to check if distro is Red Hat or clone, or Fedora __logging_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __logging_rh_distros_fedora }}" + +# Use these in conditionals to check if distro is Red Hat or clone of a specific major version +__logging_is_rh_distro_7: "{{ __logging_is_rh_distro and ansible_facts['distribution_major_version'] == '7' }}" +__logging_is_rh_distro_8: "{{ __logging_is_rh_distro and ansible_facts['distribution_major_version'] == '8' }}" +__logging_is_rh_distro_9: "{{ __logging_is_rh_distro and ansible_facts['distribution_major_version'] == '9' }}" +__logging_is_rh_distro_10: "{{ __logging_is_rh_distro and ansible_facts['distribution_major_version'] == '10' }}"