From 730a32d6b346751e4eebed6bb2dbe9ae9277d29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <joerg.sachse@slub-dresden.de>
Date: Tue, 29 Nov 2022 11:30:02 +0100
Subject: [PATCH] fix: install checkit_tiff and fixit_tiff in separate task so
we can skip them in CI
---
tasks/install-repair-tools.yml | 14 +++++++++++++-
vars/main.yml | 4 +++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/tasks/install-repair-tools.yml b/tasks/install-repair-tools.yml
index 0950422..eabc0ea 100644
--- a/tasks/install-repair-tools.yml
+++ b/tasks/install-repair-tools.yml
@@ -28,6 +28,18 @@
- "/etc/cit_tiff6_baseline_SLUB.cfg"
notify: restart repairtools
+- name: install repairtool dependencies from local Debian repo server
+ ansible.builtin.apt:
+ name: [
+ '{{ item.package_name }}={{ item.version }}',
+ ]
+ # CAUTION!!! Always use "state: present". Due to version constraints, we do
+ # not allow just any package version or automatic update
+ # mechanisms. Autoupdates will make the repair tool crash!
+ state: present
+ loop: "{{ tool_versions_local }}"
+ tags: [apt, no-ci]
+
- name: install repairtool (package dependencies are encoded in the package)
ansible.builtin.apt:
name: [
@@ -37,7 +49,7 @@
# not allow just any package version or automatic update
# mechanisms. Autoupdates will make the repair tool crash!
state: present
- loop: "{{ tool_versions }}"
+ loop: "{{ tool_versions_public }}"
tags: [apt]
- name: configure tool version pinning to avoid automatic nightly upgrades
diff --git a/vars/main.yml b/vars/main.yml
index 2fb523b..f74f633 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,9 +1,11 @@
---
-tool_versions:
+tool_versions_local:
- package_name: "checkit-tiff-upcoming"
version: "1.4.1"
- package_name: "fixit-tiff"
version: "1.3.4"
+
+tool_versions_public:
- package_name: "libtiff-tools"
version: "4.2.0-1+deb11u1"
- package_name: "libslub-lza-repair-perl"
--
GitLab