Skip to content
Snippets Groups Projects
Commit 1374756d authored by Jörg Sachse's avatar Jörg Sachse
Browse files

style: use deb822 format and remove deprecated apt_key (resolves #2233 / ND-2723)

parent 3d541f4c
No related branches found
No related tags found
No related merge requests found
......@@ -16,6 +16,10 @@ default:
- source /opt/molecule/bin/activate
- molecule destroy --scenario-name default
variables:
ANSIBLE_FORCE_COLOR: 'true'
PY_COLORS: '1'
test-job:
stage: test
tags:
......
......@@ -3,6 +3,7 @@
hosts: "*"
pre_tasks:
- name: configure additional package repositories for Debian
when: ansible_os_family == "Debian"
block:
- name: install GPG
ansible.builtin.apt:
......@@ -10,21 +11,21 @@
state: latest
update_cache: true
become: true
- name: add GPG key for SLUB Debian repository
ansible.builtin.apt_key:
url: "https://sdvdebianrepo.slub-dresden.de/deb-repository/pub.gpg.key"
state: present
become: true
- name: add repo URL to sources.list
ansible.builtin.apt_repository:
repo: "deb https://sdvdebianrepo.slub-dresden.de/deb-repository bullseye main"
state: present
update_cache: true
mode: "0644"
- name: add custom repo for SLUB's custom Debian repo
ansible.builtin.deb822_repository:
architectures: "amd64"
components: "main"
enabled: true
name: "slub"
pdiffs: true
signed_by: "https://sdvdebianrepo.slub-dresden.de/deb-repository/pub.gpg.key"
suites: "{{ ansible_lsb.codename }}"
uris: "https://sdvdebianrepo.slub-dresden.de/deb-repository"
notify: update package cache
become: true
when: ansible_os_family == "Debian"
- name: configure additional package repositories for RedHat
when: ansible_os_family == "RedHat"
block:
- name: add custom repositories
ansible.builtin.yum_repository:
......@@ -42,8 +43,15 @@
description: SLUB YUM repo
baseurl: "http://sdvrhelrepo.slub-dresden.de/"
gpgcheck: "false"
notify: update package cache
- name: remove legacy repo configuration to avoid double configuration for SLUB repo
ansible.builtin.file:
path: "/etc/yum.repos.d/SLUB.repo"
state: absent
when: ansible_os_family == "RedHat"
notify: update package cache
handlers:
- name: update package cache
ansible.builtin.package:
update_cache: true
become: true
......@@ -13,7 +13,7 @@ platforms:
# https://github.com/ansible-community/molecule-vagrant#documentation
# for more platform parameters.
- name: mol-samity
box: debian/bullseye64
box: debian/bookworm64
memory: 1024
# List of raw Vagrant `config` options.
# provider_raw_config_args:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment