Skip to content

Commit 83a70a5

Browse files
authored
Merge pull request #19 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents 4422bd7 + 49d9932 commit 83a70a5

File tree

16 files changed

+306
-191
lines changed

16 files changed

+306
-191
lines changed

.config/molecule/config.yml

Lines changed: 64 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ dependency:
44
driver:
55
name: docker
66
platforms:
7-
- cgroupns_mode: host
7+
- &common_amd64_platform_config
8+
cgroupns_mode: host
89
command: /lib/systemd/systemd
910
image: docker.io/geerlingguy/docker-amazonlinux2023-ansible:latest
1011
name: amazonlinux2023-systemd-amd64
@@ -13,179 +14,92 @@ platforms:
1314
privileged: true
1415
volumes:
1516
- /sys/fs/cgroup:/sys/fs/cgroup:rw
16-
- cgroupns_mode: host
17-
command: /lib/systemd/systemd
18-
image: docker.io/geerlingguy/docker-amazonlinux2023-ansible:latest
17+
18+
- &common_arm64_platform_config
19+
<<: *common_amd64_platform_config
1920
name: amazonlinux2023-systemd-arm64
2021
platform: arm64
21-
pre_build_image: true
22-
privileged: true
23-
volumes:
24-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
25-
# These platforms do not provide systemd-resolved.
26-
# - cgroupns_mode: host
27-
# command: /lib/systemd/systemd
28-
# image: docker.io/geerlingguy/docker-debian10-ansible:latest
29-
# name: debian10-systemd-amd64
30-
# platform: amd64
31-
# pre_build_image: true
32-
# privileged: true
33-
# volumes:
34-
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
35-
# - cgroupns_mode: host
36-
# command: /lib/systemd/systemd
37-
# image: docker.io/geerlingguy/docker-debian10-ansible:latest
38-
# name: debian10-systemd-arm64
39-
# platform: arm64
40-
# pre_build_image: true
41-
# privileged: true
42-
# volumes:
43-
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
44-
# - cgroupns_mode: host
45-
# command: /lib/systemd/systemd
46-
# image: docker.io/geerlingguy/docker-debian11-ansible:latest
47-
# name: debian11-systemd-amd64
48-
# platform: amd64
49-
# pre_build_image: true
50-
# privileged: true
51-
# volumes:
52-
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
53-
# - cgroupns_mode: host
54-
# command: /lib/systemd/systemd
55-
# image: docker.io/geerlingguy/docker-debian11-ansible:latest
56-
# name: debian11-systemd-arm64
57-
# platform: arm64
58-
# pre_build_image: true
59-
# privileged: true
60-
# volumes:
61-
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
62-
- cgroupns_mode: host
63-
command: /lib/systemd/systemd
22+
23+
- <<: *common_amd64_platform_config
24+
image: docker.io/geerlingguy/docker-debian10-ansible:latest
25+
name: debian10-systemd-amd64
26+
27+
- <<: *common_arm64_platform_config
28+
image: docker.io/geerlingguy/docker-debian10-ansible:latest
29+
name: debian10-systemd-arm64
30+
31+
- <<: *common_amd64_platform_config
32+
image: docker.io/geerlingguy/docker-debian11-ansible:latest
33+
name: debian11-systemd-amd64
34+
35+
- <<: *common_arm64_platform_config
36+
image: docker.io/geerlingguy/docker-debian11-ansible:latest
37+
name: debian11-systemd-arm64
38+
39+
- <<: *common_amd64_platform_config
6440
image: docker.io/geerlingguy/docker-debian12-ansible:latest
6541
name: debian12-systemd-amd64
66-
platform: amd64
67-
pre_build_image: true
68-
privileged: true
69-
volumes:
70-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
71-
- cgroupns_mode: host
72-
command: /lib/systemd/systemd
42+
43+
- <<: *common_arm64_platform_config
7344
image: docker.io/geerlingguy/docker-debian12-ansible:latest
7445
name: debian12-systemd-arm64
75-
platform: arm64
76-
pre_build_image: true
77-
privileged: true
78-
volumes:
79-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
80-
- cgroupns_mode: host
81-
command: /lib/systemd/systemd
82-
image: docker.io/cisagov/docker-debian13-ansible:latest
46+
47+
- <<: *common_amd64_platform_config
48+
image: docker.io/geerlingguy/docker-debian13-ansible:latest
8349
name: debian13-systemd-amd64
84-
platform: amd64
85-
pre_build_image: true
86-
privileged: true
87-
volumes:
88-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
89-
- cgroupns_mode: host
90-
command: /lib/systemd/systemd
91-
image: docker.io/cisagov/docker-debian13-ansible:latest
50+
51+
- <<: *common_arm64_platform_config
52+
image: docker.io/geerlingguy/docker-debian13-ansible:latest
9253
name: debian13-systemd-arm64
93-
platform: arm64
94-
pre_build_image: true
95-
privileged: true
96-
volumes:
97-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
98-
- cgroupns_mode: host
99-
command: /lib/systemd/systemd
54+
55+
- <<: *common_amd64_platform_config
56+
image: docker.io/cisagov/docker-debian14-ansible:latest
57+
name: debian14-systemd-amd64
58+
59+
- <<: *common_arm64_platform_config
60+
image: docker.io/cisagov/docker-debian14-ansible:latest
61+
name: debian14-systemd-arm64
62+
63+
- <<: *common_amd64_platform_config
10064
image: docker.io/cisagov/docker-kali-ansible:latest
10165
name: kali-systemd-amd64
102-
platform: amd64
103-
pre_build_image: true
104-
privileged: true
105-
volumes:
106-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
107-
- cgroupns_mode: host
108-
command: /lib/systemd/systemd
66+
67+
- <<: *common_arm64_platform_config
10968
image: docker.io/cisagov/docker-kali-ansible:latest
11069
name: kali-systemd-arm64
111-
platform: arm64
112-
pre_build_image: true
113-
privileged: true
114-
volumes:
115-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
116-
- cgroupns_mode: host
117-
command: /lib/systemd/systemd
70+
71+
- <<: *common_amd64_platform_config
11872
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
11973
name: fedora41-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
74+
75+
- <<: *common_arm64_platform_config
12776
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
12877
name: fedora41-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
78+
79+
- <<: *common_amd64_platform_config
13680
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
13781
name: fedora42-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
82+
83+
- <<: *common_arm64_platform_config
14584
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
14685
name: fedora42-systemd-arm64
147-
platform: arm64
148-
pre_build_image: true
149-
privileged: true
150-
volumes:
151-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
152-
# These platforms do not provide systemd-resolved.
153-
# - cgroupns_mode: host
154-
# command: /lib/systemd/systemd
155-
# image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
156-
# name: ubuntu-22-systemd-amd64
157-
# platform: amd64
158-
# pre_build_image: true
159-
# privileged: true
160-
# volumes:
161-
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
162-
# - cgroupns_mode: host
163-
# command: /lib/systemd/systemd
164-
# image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
165-
# name: ubuntu-22-systemd-arm64
166-
# platform: arm64
167-
# pre_build_image: true
168-
# privileged: true
169-
# volumes:
170-
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
171-
- cgroupns_mode: host
172-
command: /lib/systemd/systemd
86+
87+
- <<: *common_amd64_platform_config
88+
image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
89+
name: ubuntu-22-systemd-amd64
90+
91+
- <<: *common_arm64_platform_config
92+
image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
93+
name: ubuntu-22-systemd-arm64
94+
95+
- <<: *common_amd64_platform_config
17396
image: docker.io/geerlingguy/docker-ubuntu2404-ansible:latest
17497
name: ubuntu-24-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
98+
99+
- <<: *common_arm64_platform_config
182100
image: docker.io/geerlingguy/docker-ubuntu2404-ansible:latest
183101
name: ubuntu-24-systemd-arm64
184-
platform: arm64
185-
pre_build_image: true
186-
privileged: true
187-
volumes:
188-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
102+
189103
provisioner:
190104
name: ansible
191105
config_options:

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ updates:
1212
- dependency-name: actions/cache
1313
- dependency-name: actions/checkout
1414
- dependency-name: actions/dependency-review-action
15+
- dependency-name: actions/labeler
1516
- dependency-name: actions/setup-go
1617
- dependency-name: actions/setup-python
1718
- dependency-name: cisagov/action-job-preamble
@@ -24,6 +25,12 @@ updates:
2425
# Managed by cisagov/skeleton-ansible-role
2526
- dependency-name: cisagov/action-disable-apparmor
2627
- dependency-name: docker/setup-buildx-action
28+
labels:
29+
# dependabot default we need to replicate
30+
- dependencies
31+
# This matches our label definition in .github/labels.yml as opposed to
32+
# dependabot's default of `github_actions`.
33+
- github-actions
2734
package-ecosystem: github-actions
2835
schedule:
2936
interval: weekly

.github/labeler.yml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
---
2+
# Each entry in this file is a label that will be applied to pull requests
3+
# if there is a match based on the matching rules for the entry. Please see
4+
# the actions/labeler documentation for more information:
5+
# https://github.com/actions/labeler#match-object
6+
#
7+
# Note: Verify that the label you want to use is defined in the
8+
# crazy-max/ghaction-github-labeler configuration file located at
9+
# .github/labels.yml.
10+
11+
# Enable if Ansible playbooks are used in the repository.
12+
ansible:
13+
- changed-files:
14+
- any-glob-to-any-file:
15+
- defaults/**/*.yml
16+
- handlers/**/*.yml
17+
- meta/**/*.yml
18+
- tasks/**/*.yml
19+
- vars/**/*.yml
20+
dependencies:
21+
- changed-files:
22+
- any-glob-to-any-file:
23+
# Add any dependency files used.
24+
- .pre-commit-config.yaml
25+
- meta/**/*.yml
26+
- requirements*.txt
27+
# Enable if Docker is used in the repository.
28+
# docker:
29+
# - changed-files:
30+
# - any-glob-to-any-file:
31+
# - "**/compose*.yml"
32+
# - "**/docker-compose*.yml"
33+
# - "**/Dockerfile*"
34+
documentation:
35+
- changed-files:
36+
- any-glob-to-any-file:
37+
- "**/*.md"
38+
github-actions:
39+
- changed-files:
40+
- any-glob-to-any-file:
41+
- .github/workflows/**
42+
# Enable if Packer is used in the repository.
43+
# packer:
44+
# - changed-files:
45+
# - any-glob-to-any-file:
46+
# - "**/*.pkr.hcl"
47+
# Enable if Python is used in the repository.
48+
python:
49+
- changed-files:
50+
- any-glob-to-any-file:
51+
- "**/*.py"
52+
# Enable if Terraform is used in the repository.
53+
# terraform:
54+
# - changed-files:
55+
# - any-glob-to-any-file:
56+
# - "**/*.tf"
57+
test:
58+
- changed-files:
59+
- any-glob-to-any-file:
60+
# Add any test-related files or paths.
61+
- .ansible-lint
62+
- .bandit.yml
63+
- .config/molecule/config.yml
64+
- .flake8
65+
- .isort.cfg
66+
- .mdl_config.yaml
67+
- .yamllint
68+
- molecule/**
69+
upstream update:
70+
- head-branch:
71+
# Any Lineage pull requests should use this branch.
72+
- lineage/skeleton
73+
version bump:
74+
- changed-files:
75+
- any-glob-to-any-file:
76+
# Ensure this matches your version tracking file(s).
77+
- version.txt

.github/labels.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# Rather than breaking up descriptions into multiline strings we disable that
33
# specific rule in yamllint for this file.
44
# yamllint disable rule:line-length
5+
- color: f15a53
6+
description: Pull requests that update Ansible code
7+
name: ansible
58
- color: eb6420
69
description: This issue or pull request is awaiting the outcome of another issue or pull request
710
name: blocked
@@ -17,6 +20,9 @@
1720
- color: 0366d6
1821
description: Pull requests that update a dependency file
1922
name: dependencies
23+
- color: 2497ed
24+
description: Pull requests that update Docker code
25+
name: docker
2026
- color: 5319e7
2127
description: This issue or pull request improves or adds to documentation
2228
name: documentation
@@ -50,12 +56,21 @@
5056
- color: fcdb45
5157
description: This pull request is awaiting an action or decision to move forward
5258
name: on hold
59+
- color: 02a8ef
60+
description: Pull requests that update Packer code
61+
name: packer
62+
- color: 3772a4
63+
description: Pull requests that update Python code
64+
name: python
5365
- color: ef476c
5466
description: This issue is a request for information or needs discussion
5567
name: question
5668
- color: d73a4a
5769
description: This issue or pull request addresses a security issue
5870
name: security
71+
- color: 7b42bc
72+
description: Pull requests that update Terraform code
73+
name: terraform
5974
- color: 00008b
6075
description: This issue or pull request adds or otherwise modifies test code
6176
name: test

0 commit comments

Comments
 (0)