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`