Skip to content

Commit d98a589

Browse files
authored
Merge pull request #65 from cisagov/lineage/skeleton
Lineage pull request for: skeleton
2 parents 0672942 + c0457d2 commit d98a589

File tree

5 files changed

+8
-48
lines changed

5 files changed

+8
-48
lines changed

.config/molecule/config.yml

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -113,42 +113,6 @@ platforms:
113113
privileged: true
114114
volumes:
115115
- /sys/fs/cgroup:/sys/fs/cgroup:rw
116-
- cgroupns_mode: host
117-
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
138-
platform: amd64
139-
pre_build_image: true
140-
privileged: true
141-
volumes:
142-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
143-
- cgroupns_mode: host
144-
command: /lib/systemd/systemd
145-
image: docker.io/geerlingguy/docker-fedora40-ansible:latest
146-
name: fedora40-systemd-arm64
147-
platform: arm64
148-
pre_build_image: true
149-
privileged: true
150-
volumes:
151-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
152116
- cgroupns_mode: host
153117
command: /lib/systemd/systemd
154118
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
@@ -169,17 +133,17 @@ platforms:
169133
- /sys/fs/cgroup:/sys/fs/cgroup:rw
170134
- cgroupns_mode: host
171135
command: /lib/systemd/systemd
172-
image: docker.io/geerlingguy/docker-ubuntu2004-ansible:latest
173-
name: ubuntu-20-systemd-amd64
136+
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
137+
name: fedora42-systemd-amd64
174138
platform: amd64
175139
pre_build_image: true
176140
privileged: true
177141
volumes:
178142
- /sys/fs/cgroup:/sys/fs/cgroup:rw
179143
- cgroupns_mode: host
180144
command: /lib/systemd/systemd
181-
image: docker.io/geerlingguy/docker-ubuntu2004-ansible:latest
182-
name: ubuntu-20-systemd-arm64
145+
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
146+
name: fedora42-systemd-arm64
183147
platform: arm64
184148
pre_build_image: true
185149
privileged: true

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,9 @@ jobs:
223223
- debian11-systemd
224224
- debian12-systemd
225225
- debian13-systemd
226-
- fedora39-systemd
227-
- fedora40-systemd
228226
- fedora41-systemd
227+
- fedora42-systemd
229228
- kali-systemd
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
@@ -36,15 +36,13 @@ galaxy_info:
3636
- trixie
3737
- name: Fedora
3838
versions:
39-
- "39"
40-
- "40"
4139
- "41"
40+
- "42"
4241
- name: Kali
4342
versions:
4443
- "2023"
4544
- name: Ubuntu
4645
versions:
47-
- focal
4846
- jammy
4947
- noble
5048
role_name: xfce_cool

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)