From c22e1fcd464088acb81083c94c8c311d21b62bb2 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 13 Jan 2026 07:51:12 -0700 Subject: [PATCH] ci: use ANSIBLE_INJECT_FACT_VARS=false by default for testing Ansible 2.20 has deprecated the use of Ansible facts as variables. For example, `ansible_distribution` is now deprecated in favor of `ansible_facts["distribution"]`. This is due to making the default setting `INJECT_FACTS_AS_VARS=false`. For now, this will create WARNING messages, but in Ansible 2.24 it will be an error. In order to ensure that commits and PRs conform to this, use ANSIBLE_INJECT_FACT_VARS=false by default in our CI testing. Update README-ostree.md if needed. See https://docs.ansible.com/projects/ansible/latest/porting_guides/porting_guide_core_2.20.html#inject-facts-as-vars Signed-off-by: Rich Megginson --- .github/workflows/qemu-kvm-integration-tests.yml | 1 + .github/workflows/tft.yml | 1 + README-ostree.md | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qemu-kvm-integration-tests.yml b/.github/workflows/qemu-kvm-integration-tests.yml index 470840e..55801c9 100644 --- a/.github/workflows/qemu-kvm-integration-tests.yml +++ b/.github/workflows/qemu-kvm-integration-tests.yml @@ -44,6 +44,7 @@ jobs: env: TOX_ARGS: "--skip-tags tests::infiniband,tests::nvme,tests::scsi" + ANSIBLE_INJECT_FACT_VARS: "false" steps: - name: Checkout repo diff --git a/.github/workflows/tft.yml b/.github/workflows/tft.yml index 41510ae..185a94e 100644 --- a/.github/workflows/tft.yml +++ b/.github/workflows/tft.yml @@ -168,6 +168,7 @@ jobs: SR_ARTIFACTS_DIR=${{ steps.set_vars.outputs.ARTIFACTS_DIR }};\ SR_TEST_LOCAL_CHANGES=false;\ SR_LSR_USER=${{ vars.SR_LSR_USER }};\ + SR_ANSIBLE_INJECT_FACT_VARS=false;\ SR_ARTIFACTS_URL=${{ steps.set_vars.outputs.ARTIFACTS_URL }}" # Note that LINUXSYSTEMROLES_SSH_KEY must be single-line, TF doesn't read multi-line variables fine. secrets: "SR_LSR_DOMAIN=${{ secrets.SR_LSR_DOMAIN }};\ diff --git a/README-ostree.md b/README-ostree.md index a9f0185..af5bcdc 100644 --- a/README-ostree.md +++ b/README-ostree.md @@ -20,8 +20,8 @@ Usage: .ostree/get_ostree_data.sh packages runtime DISTRO-VERSION FORMAT ``` -`DISTRO-VERSION` is in the format that Ansible uses for `ansible_distribution` -and `ansible_distribution_version` - for example, `Fedora-38`, `CentOS-8`, +`DISTRO-VERSION` is in the format that Ansible uses for `ansible_facts["distribution"]` +and `ansible_facts["distribution_version"]` - for example, `Fedora-38`, `CentOS-8`, `RedHat-9.4` `FORMAT` is one of `toml`, `json`, `yaml`, `raw`