Skip to content

Commit f22743c

Browse files
committed
Update tests to bookworm; add workarounds
1 parent fac7f0d commit f22743c

File tree

8 files changed

+45
-12
lines changed

8 files changed

+45
-12
lines changed

molecule/default/molecule.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
driver:
33
name: docker
44
platforms:
5-
- name: bullseye
5+
- name: bookworm
66
# pin to current debian stable
7-
image: python:3-bullseye
7+
image: python:3-bookworm
88
pre_build_image: true
99
groups:
1010
- amd_firmware

molecule/libvirt/molecule.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ driver:
55
name: libvirt
66
provision: true
77
platforms:
8-
- name: bullseye
8+
- name: bookworm
99
# pin to current debian stable
10-
box: debian/bullseye64
10+
box: debian/bookworm64
11+
# installing Zoom flatpak requires more than 512 MB memory
12+
memory: 1024
1113
groups:
1214
- ansible_pull_managed
1315
# TODO enable after able to add component idempotently

molecule/resources/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ driver:
77
platforms:
88
- name: instance
99
# pin to current debian stable
10-
image: python:3-bullseye
10+
image: python:3-bookworm
1111
pre_build_image: true
1212
dependency:
1313
name: galaxy

roles/amd_firmware/tasks/main.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,22 @@
66
packages:
77
- software-properties-common
88

9-
- name: Add non-free sources
10-
ansible.builtin.command: apt-add-repository non-free
9+
- name: Add non-free-firmware sources
10+
ansible.builtin.command: apt-add-repository --yes non-free-firmware
1111
register: add_component_result
1212
notify:
1313
- Update package lists
1414
changed_when: '"component enabled" in add_component_result.stdout'
15+
when: ansible_facts["distribution_major_version"] != "12"
16+
17+
- name: Add non-free-firmware component (for bookworm)
18+
ansible.builtin.replace:
19+
path: /etc/apt/sources.list.d/debian.sources
20+
regexp: '^Components: main$'
21+
replace: 'Components: main non-free non-free-firmware'
22+
notify:
23+
- Update package lists
24+
when: ansible_facts["distribution_major_version"] == "12"
1525

1626
- name: Flush all notified handlers
1727
ansible.builtin.meta: flush_handlers

roles/base/tasks/main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
- name: Install tool to detect local caching proxies
99
ansible.builtin.apt:
1010
name: squid-deb-proxy-client
11+
when: ansible_facts["distribution_major_version"] != "12"

roles/biostar_firmware/molecule/default/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
platforms:
55
- name: instance
66
# pin to current debian stable
7-
image: python:3-bullseye
7+
image: python:3-bookworm
88
pre_build_image: true
99
provisioner:
1010
name: ansible

roles/biostar_firmware/tasks/main.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,22 @@
66
packages:
77
- software-properties-common
88

9-
- name: Add non-free sources
10-
ansible.builtin.command: apt-add-repository non-free
9+
- name: Add non-free-firmware sources
10+
ansible.builtin.command: apt-add-repository --yes non-free-firmware
1111
register: add_component_result
1212
notify:
1313
- Update package lists
1414
changed_when: '"component enabled" in add_component_result.stdout'
15+
when: ansible_facts["distribution_major_version"] != "12"
16+
17+
- name: Add non-free and non-free-firmware component (for bookworm)
18+
ansible.builtin.replace:
19+
path: /etc/apt/sources.list.d/debian.sources
20+
regexp: '^Components: main$'
21+
replace: 'Components: main non-free non-free-firmware'
22+
notify:
23+
- Update package lists
24+
when: ansible_facts["distribution_major_version"] == "12"
1525

1626
- name: Flush all notified handlers
1727
ansible.builtin.meta: flush_handlers

roles/hp_firmware/tasks/main.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,22 @@
66
packages:
77
- software-properties-common
88

9-
- name: Add non-free sources
10-
ansible.builtin.command: apt-add-repository non-free
9+
- name: Add non-free-firmware sources
10+
ansible.builtin.command: apt-add-repository --yes non-free-firmware
1111
register: add_component_result
1212
notify:
1313
- Update package lists
1414
changed_when: '"component enabled" in add_component_result.stdout'
15+
when: ansible_facts["distribution_major_version"] != "12"
16+
17+
- name: Add non-free-firmware component (for bookworm)
18+
ansible.builtin.replace:
19+
path: /etc/apt/sources.list.d/debian.sources
20+
regexp: '^Components: main$'
21+
replace: 'Components: main non-free non-free-firmware'
22+
notify:
23+
- Update package lists
24+
when: ansible_facts["distribution_major_version"] == "12"
1525

1626
- name: Flush all notified handlers
1727
ansible.builtin.meta: flush_handlers

0 commit comments

Comments
 (0)