From f5c9e4b9c51c91ef739e4263a379d15484ad4abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <joerg.sachse@slub-dresden.de>
Date: Mon, 4 Mar 2024 13:46:49 +0100
Subject: [PATCH] style: use deb822 format and remove deprecated apt_key
(resolves #2233 / ND-2723)
---
.gitlab-ci.yml | 3 ++-
molecule/virtualbox/molecule.yml | 4 ++--
tasks/install_packages.yml | 6 +++++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ffe55f..632d043 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,8 @@ test-job:
script:
# make sure that Ansible Vaults are present and can be decrypted
- echo "${VAULT_SANITYTEST}" > ../lza_sanitytest.pass
- - export ANSIBLE_VAULT_IDENTITY_LIST="../lza_sanitytest.pass"
+ #- export ANSIBLE_VAULT_IDENTITY_LIST="../../../lza_sanitytest.pass"
+ #- export ANSIBLE_VAULT_IDENTITY_LIST="../lza_sanitytest.pass"
- rm -rf ../ansible_vaults/
- git clone https://gitlab+deploy-token-25:${VAULT_ACCESS_TOKEN}@git.slub-dresden.de/slub-referat-2-3/ansible_vaults.git ../ansible_vaults/; \
# run Molecule tests
diff --git a/molecule/virtualbox/molecule.yml b/molecule/virtualbox/molecule.yml
index 277e9d4..d655005 100644
--- a/molecule/virtualbox/molecule.yml
+++ b/molecule/virtualbox/molecule.yml
@@ -12,7 +12,7 @@ platforms:
# Check out the documentation at
# https://github.com/ansible-community/molecule-vagrant#documentation
# for more platform parameters.
- - name: mol-samity
+ - name: mol-sanity
box: debian/bookworm64
memory: 1024
# List of raw Vagrant `config` options.
@@ -28,7 +28,7 @@ provisioner:
config_options:
defaults:
# https://stackoverflow.com/questions/57435811/ansible-molecule-pass-multiple-vault-ids
- vault_identity_list: "../../../lza_sanitytest.pass"
+ vault_identity_list: " ../lza_sanitytest.pass, ../../../lza_sanitytest.pass"
vvv: false
playbooks:
# create: ../resources/playbooks/create.yml
diff --git a/tasks/install_packages.yml b/tasks/install_packages.yml
index 531b11a..cb7ff01 100644
--- a/tasks/install_packages.yml
+++ b/tasks/install_packages.yml
@@ -14,7 +14,9 @@
name: [
'cifs-utils',
'cpanminus',
+ 'gcc',
'git',
+ 'libxml2',
'make',
'perl',
'perl-base',
@@ -41,6 +43,7 @@
- name: install Perl packages from CPAN
community.general.cpanm:
name: "{{ item }}"
+ mode: "new"
loop:
# these are part of the "perl-base" Debian 10 package, so we get them for free:
# - "Carp"
@@ -50,7 +53,8 @@
# - "IO::Handle"
# and these are not, so they must be installed using cpanm:
- "Bloom::Filter"
- - "File::Find"
+ - "File::Find" # For some reason unknown, this package is not idempotent.
- "File::Sort"
- "Path::Tiny"
- "XML::LibXML::XPathContext"
+ changed_when: false
--
GitLab