Skip to content

Commit ab0753e

Browse files
authored
Merge pull request #17 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents 91888d9 + e687187 commit ab0753e

File tree

5 files changed

+12
-52
lines changed

5 files changed

+12
-52
lines changed

.config/molecule/config.yml

Lines changed: 8 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -115,53 +115,35 @@ platforms:
115115
- /sys/fs/cgroup:/sys/fs/cgroup:rw
116116
- cgroupns_mode: host
117117
command: /lib/systemd/systemd
118-
image: docker.io/geerlingguy/docker-fedora39-ansible:latest
119-
name: fedora39-systemd-amd64
120-
platform: amd64
121-
pre_build_image: true
122-
privileged: true
123-
volumes:
124-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
125-
- cgroupns_mode: host
126-
command: /lib/systemd/systemd
127-
image: docker.io/geerlingguy/docker-fedora39-ansible:latest
128-
name: fedora39-systemd-arm64
129-
platform: arm64
130-
pre_build_image: true
131-
privileged: true
132-
volumes:
133-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
134-
- cgroupns_mode: host
135-
command: /lib/systemd/systemd
136-
image: docker.io/geerlingguy/docker-fedora40-ansible:latest
137-
name: fedora40-systemd-amd64
118+
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
119+
name: fedora41-systemd-amd64
138120
platform: amd64
139121
pre_build_image: true
140122
privileged: true
141123
volumes:
142124
- /sys/fs/cgroup:/sys/fs/cgroup:rw
143125
- cgroupns_mode: host
144126
command: /lib/systemd/systemd
145-
image: docker.io/geerlingguy/docker-fedora40-ansible:latest
146-
name: fedora40-systemd-arm64
127+
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
128+
name: fedora41-systemd-arm64
147129
platform: arm64
148130
pre_build_image: true
149131
privileged: true
150132
volumes:
151133
- /sys/fs/cgroup:/sys/fs/cgroup:rw
152134
- cgroupns_mode: host
153135
command: /lib/systemd/systemd
154-
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
155-
name: fedora41-systemd-amd64
136+
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
137+
name: fedora42-systemd-amd64
156138
platform: amd64
157139
pre_build_image: true
158140
privileged: true
159141
volumes:
160142
- /sys/fs/cgroup:/sys/fs/cgroup:rw
161143
- cgroupns_mode: host
162144
command: /lib/systemd/systemd
163-
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
164-
name: fedora41-systemd-arm64
145+
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
146+
name: fedora42-systemd-arm64
165147
platform: arm64
166148
pre_build_image: true
167149
privileged: true
@@ -170,24 +152,6 @@ platforms:
170152
# These platforms do not provide systemd-resolved.
171153
# - cgroupns_mode: host
172154
# command: /lib/systemd/systemd
173-
# image: docker.io/geerlingguy/docker-ubuntu2004-ansible:latest
174-
# name: ubuntu-20-systemd-amd64
175-
# platform: amd64
176-
# pre_build_image: true
177-
# privileged: true
178-
# volumes:
179-
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
180-
# - cgroupns_mode: host
181-
# command: /lib/systemd/systemd
182-
# image: docker.io/geerlingguy/docker-ubuntu2004-ansible:latest
183-
# name: ubuntu-20-systemd-arm64
184-
# platform: arm64
185-
# pre_build_image: true
186-
# privileged: true
187-
# volumes:
188-
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
189-
# - cgroupns_mode: host
190-
# command: /lib/systemd/systemd
191155
# image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
192156
# name: ubuntu-22-systemd-amd64
193157
# platform: amd64

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,10 @@ jobs:
222222
# - debian11-systemd
223223
- debian12-systemd
224224
- debian13-systemd
225-
- fedora39-systemd
226-
- fedora40-systemd
227225
- fedora41-systemd
226+
- fedora42-systemd
228227
- kali-systemd
229228
# These platforms do not provide systemd-resolved.
230-
# - ubuntu-20-systemd
231229
# - ubuntu-22-systemd
232230
- ubuntu-24-systemd
233231
scenario:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ repos:
173173

174174
# Ansible hooks
175175
- repo: https://github.com/ansible/ansible-lint
176-
rev: v25.1.3
176+
rev: v25.4.0
177177
hooks:
178178
- id: ansible-lint
179179
additional_dependencies:

meta/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,14 @@ galaxy_info:
3434
- trixie
3535
- name: Fedora
3636
versions:
37-
- "39"
38-
- "40"
3937
- "41"
38+
- "42"
4039
- name: Kali
4140
versions:
4241
- "2023"
4342
- name: Ubuntu
4443
versions:
4544
# These platforms do not provide systemd-resolved.
46-
# - focal
4745
# - jammy
4846
- noble
4947
role_name: systemd_resolved

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0
1+
2.0.0

0 commit comments

Comments
 (0)