diff --git a/molecule/resources/playbooks/prepare.yml b/molecule/resources/playbooks/prepare.yml index 078471a22f900806c3b11060830029c573541c29..dc1563d4a89cc68156af972e027aeebecbaf243e 100644 --- a/molecule/resources/playbooks/prepare.yml +++ b/molecule/resources/playbooks/prepare.yml @@ -9,24 +9,24 @@ - name: configure additional package repositories for Debian when: ansible_os_family == "Debian" block: - - name: install GPG - ansible.builtin.apt: - name: "gnupg" - state: latest - update_cache: true - become: true - - 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 + - name: install GPG + ansible.builtin.apt: + name: "gnupg" + state: latest + update_cache: true + become: true + - 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 - name: install tooling before running the actual tests, so we're not bound by the fixed versions ansible.builtin.apt: name: [ @@ -39,28 +39,28 @@ - name: configure additional package repositories for RedHat block: - - name: add custom repositories - ansible.builtin.yum_repository: - name: "{{ item.name }}" - description: "{{ item.description }}" - baseurl: "{{ item.baseurl }}" - gpgcheck: "{{ item.gpgcheck | default('true') }}" - gpgkey: "{{ item.gpgkey | default(omit) }}" - loop: - - name: "epel" - description: EPEL YUM repo - baseurl: "https://download.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/x86_64/" - gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}" - - name: "slub" - description: SLUB YUM repo - baseurl: "https://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 - notify: update package cache + - name: add custom repositories + ansible.builtin.yum_repository: + name: "{{ item.name }}" + description: "{{ item.description }}" + baseurl: "{{ item.baseurl }}" + gpgcheck: "{{ item.gpgcheck | default('true') }}" + gpgkey: "{{ item.gpgkey | default(omit) }}" + loop: + - name: "epel" + description: EPEL YUM repo + baseurl: "https://download.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/x86_64/" + gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}" + - name: "slub" + description: SLUB YUM repo + baseurl: "https://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 + notify: update package cache when: ansible_os_family == "RedHat" # Ansible roles can install a multitude of firewall rules, some of which