Revert "Try and install jinjaturtle via poetry / appimage"
This reverts commit 76aafcc08d.
This commit is contained in:
parent
b546bb9bf2
commit
bb17e57f93
1 changed files with 22 additions and 5 deletions
27
tests.sh
27
tests.sh
|
|
@ -226,11 +226,23 @@ ensure_jinjaturtle() {
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Clone git repo
|
if is_debian; then
|
||||||
run git clone https://git.mig5.net/mig5/jinjaturtle /tmp/jinjaturtle
|
pkg_install ca-certificates curl gnupg lsb-release
|
||||||
cd /tmp/jinjaturtle && run poetry install --with dev
|
run mkdir -p /usr/share/keyrings
|
||||||
cd /tmp/jinjaturtle && run poetry build
|
run bash -c "curl -fsSL https://mig5.net/static/mig5.asc | gpg --dearmor --yes -o /usr/share/keyrings/mig5.gpg"
|
||||||
cd /tmp/jinjaturtle && run poetry run pyproject-appimage --output /usr/bin/jinjaturtle
|
|
||||||
|
local codename
|
||||||
|
codename="$(lsb_release -cs)"
|
||||||
|
run bash -c "printf '%s\n' 'deb [arch=amd64 signed-by=/usr/share/keyrings/mig5.gpg] https://apt.mig5.net ${codename} main' > /etc/apt/sources.list.d/mig5.list"
|
||||||
|
run apt-get update
|
||||||
|
APT_UPDATED=1
|
||||||
|
run env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends jinjaturtle
|
||||||
|
elif is_rpm_family; then
|
||||||
|
printf 'Skipping JinjaTurtle package integration on RPM-family CI;\n'
|
||||||
|
return
|
||||||
|
else
|
||||||
|
fail "Unsupported OS for JinjaTurtle package install: $(os_id)."
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
require_cmd() {
|
require_cmd() {
|
||||||
|
|
@ -320,6 +332,11 @@ run_ansible_jinjaturtle_variant() {
|
||||||
}
|
}
|
||||||
|
|
||||||
run_jinjaturtle_manifest_tests() {
|
run_jinjaturtle_manifest_tests() {
|
||||||
|
if is_rpm_family ; then
|
||||||
|
section "JinjaTurtle integration matrix"
|
||||||
|
printf 'Skipping JinjaTurtle package integration on RPM-family CI;\n'
|
||||||
|
return
|
||||||
|
fi
|
||||||
ensure_jinjaturtle
|
ensure_jinjaturtle
|
||||||
require_cmd jinjaturtle "Install JinjaTurtle before running the JinjaTurtle integration matrix."
|
require_cmd jinjaturtle "Install JinjaTurtle before running the JinjaTurtle integration matrix."
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue