From bb17e57f93bff78f91100fade009df66ff49b180 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Mon, 29 Jun 2026 15:05:26 +1000 Subject: [PATCH] Revert "Try and install jinjaturtle via poetry / appimage" This reverts commit 76aafcc08dfa6f27a191859c858202c394c5714e. --- tests.sh | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/tests.sh b/tests.sh index 1af7842..64e5218 100755 --- a/tests.sh +++ b/tests.sh @@ -226,11 +226,23 @@ ensure_jinjaturtle() { return fi - # Clone git repo - run git clone https://git.mig5.net/mig5/jinjaturtle /tmp/jinjaturtle - cd /tmp/jinjaturtle && run poetry install --with dev - cd /tmp/jinjaturtle && run poetry build - cd /tmp/jinjaturtle && run poetry run pyproject-appimage --output /usr/bin/jinjaturtle + if is_debian; then + pkg_install ca-certificates curl gnupg lsb-release + run mkdir -p /usr/share/keyrings + run bash -c "curl -fsSL https://mig5.net/static/mig5.asc | gpg --dearmor --yes -o /usr/share/keyrings/mig5.gpg" + + 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() { @@ -320,6 +332,11 @@ run_ansible_jinjaturtle_variant() { } 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 require_cmd jinjaturtle "Install JinjaTurtle before running the JinjaTurtle integration matrix."