particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools/provision: remove json_query usage from ansible playbooks

Browse source 
`json_query` requires python3-jmespath which, while available in the
repos, it can sometimes cause issues when the ansible interpreter is
different from the system interpreter.
The `json_query` is only used in a handful of locations that can easily
be served by `jq`, which we use in other places already.
This commit is contained in:
Achilleas Koutsou 2022-01-14 13:22:39 +01:00
parent 5617a0744a
commit 93c0485531
3 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/provision.sh
View file

@ -18,11 +18,15 @@ elif [[ $ID == rhel || $ID == centos ]] && [[ ${VERSION_ID%.*} == 9 ]]; then
curl -LO --insecure https://hdn.corp.redhat.com/rhel8-csb/RPMS/noarch/redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm
sudo dnf install -y ./redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm dnf-plugins-core
sudo dnf copr enable -y copr.devel.redhat.com/osbuild-team/epel-el9 "rhel-9.dev-$ARCH"
# jmespath required for json_query
sudo dnf install -y ansible-core koji python3-jmespath
fi
# json_query filter, used in our ansible playbooks, was moved to the
# 'community.general' collection
# RHEL 8.6+ and CentOS 9 require different handling for ansible
ge86=$(echo "${VERSION_ID}" | awk '{print $1 >= 8.6}') # do a numerical comparison for the version
echo -n "${ID}=${VERSION_ID} "
if [[ "${ID}" == "rhel" || "${ID}" == "centos" ]] && (( ge86 )); then
sudo dnf install -y ansible-core koji
# NOTE: do we need this?
sudo ansible-galaxy collection install community.general
fi