Skip to content

Commit 09729c9

Browse files
author
jsf9k
committed
# Conflicts: # .github/dependabot.yml
2 parents c1c5aa8 + 3260b69 commit 09729c9

File tree

14 files changed

+281
-174
lines changed

14 files changed

+281
-174
lines changed

.config/molecule/config.yml

Lines changed: 52 additions & 136 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,177 +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-
- cgroupns_mode: host
26-
command: /lib/systemd/systemd
22+
23+
- <<: *common_amd64_platform_config
2724
image: docker.io/geerlingguy/docker-debian10-ansible:latest
2825
name: debian10-systemd-amd64
29-
platform: amd64
30-
pre_build_image: true
31-
privileged: true
32-
volumes:
33-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
34-
- cgroupns_mode: host
35-
command: /lib/systemd/systemd
26+
27+
- <<: *common_arm64_platform_config
3628
image: docker.io/geerlingguy/docker-debian10-ansible:latest
3729
name: debian10-systemd-arm64
38-
platform: arm64
39-
pre_build_image: true
40-
privileged: true
41-
volumes:
42-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
43-
- cgroupns_mode: host
44-
command: /lib/systemd/systemd
30+
31+
- <<: *common_amd64_platform_config
4532
image: docker.io/geerlingguy/docker-debian11-ansible:latest
4633
name: debian11-systemd-amd64
47-
platform: amd64
48-
pre_build_image: true
49-
privileged: true
50-
volumes:
51-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
52-
- cgroupns_mode: host
53-
command: /lib/systemd/systemd
34+
35+
- <<: *common_arm64_platform_config
5436
image: docker.io/geerlingguy/docker-debian11-ansible:latest
5537
name: debian11-systemd-arm64
56-
platform: arm64
57-
pre_build_image: true
58-
privileged: true
59-
volumes:
60-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
61-
- cgroupns_mode: host
62-
command: /lib/systemd/systemd
38+
39+
- <<: *common_amd64_platform_config
6340
image: docker.io/geerlingguy/docker-debian12-ansible:latest
6441
name: debian12-systemd-amd64
65-
platform: amd64
66-
pre_build_image: true
67-
privileged: true
68-
volumes:
69-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
70-
- cgroupns_mode: host
71-
command: /lib/systemd/systemd
42+
43+
- <<: *common_arm64_platform_config
7244
image: docker.io/geerlingguy/docker-debian12-ansible:latest
7345
name: debian12-systemd-arm64
74-
platform: arm64
75-
pre_build_image: true
76-
privileged: true
77-
volumes:
78-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
79-
- cgroupns_mode: host
80-
command: /lib/systemd/systemd
81-
image: docker.io/cisagov/docker-debian13-ansible:latest
46+
47+
- <<: *common_amd64_platform_config
48+
image: docker.io/geerlingguy/docker-debian13-ansible:latest
8249
name: debian13-systemd-amd64
83-
platform: amd64
84-
pre_build_image: true
85-
privileged: true
86-
volumes:
87-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
88-
- cgroupns_mode: host
89-
command: /lib/systemd/systemd
90-
image: docker.io/cisagov/docker-debian13-ansible:latest
50+
51+
- <<: *common_arm64_platform_config
52+
image: docker.io/geerlingguy/docker-debian13-ansible:latest
9153
name: debian13-systemd-arm64
92-
platform: arm64
93-
pre_build_image: true
94-
privileged: true
95-
volumes:
96-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
97-
- cgroupns_mode: host
98-
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
9964
image: docker.io/cisagov/docker-kali-ansible:latest
10065
name: kali-systemd-amd64
101-
platform: amd64
102-
pre_build_image: true
103-
privileged: true
104-
volumes:
105-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
106-
- cgroupns_mode: host
107-
command: /lib/systemd/systemd
66+
67+
- <<: *common_arm64_platform_config
10868
image: docker.io/cisagov/docker-kali-ansible:latest
10969
name: kali-systemd-arm64
110-
platform: arm64
111-
pre_build_image: true
112-
privileged: true
113-
volumes:
114-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
115-
- cgroupns_mode: host
116-
command: /lib/systemd/systemd
70+
71+
- <<: *common_amd64_platform_config
11772
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
11873
name: fedora41-systemd-amd64
119-
platform: amd64
120-
pre_build_image: true
121-
privileged: true
122-
volumes:
123-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
124-
- cgroupns_mode: host
125-
command: /lib/systemd/systemd
74+
75+
- <<: *common_arm64_platform_config
12676
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
12777
name: fedora41-systemd-arm64
128-
platform: arm64
129-
pre_build_image: true
130-
privileged: true
131-
volumes:
132-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
133-
- cgroupns_mode: host
134-
command: /lib/systemd/systemd
78+
79+
- <<: *common_amd64_platform_config
13580
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
13681
name: fedora42-systemd-amd64
137-
platform: amd64
138-
pre_build_image: true
139-
privileged: true
140-
volumes:
141-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
142-
- cgroupns_mode: host
143-
command: /lib/systemd/systemd
82+
83+
- <<: *common_arm64_platform_config
14484
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
14585
name: fedora42-systemd-arm64
146-
platform: arm64
147-
pre_build_image: true
148-
privileged: true
149-
volumes:
150-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
151-
- cgroupns_mode: host
152-
command: /lib/systemd/systemd
86+
87+
- <<: *common_amd64_platform_config
15388
image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
15489
name: ubuntu-22-systemd-amd64
155-
platform: amd64
156-
pre_build_image: true
157-
privileged: true
158-
volumes:
159-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
160-
- cgroupns_mode: host
161-
command: /lib/systemd/systemd
90+
91+
- <<: *common_arm64_platform_config
16292
image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
16393
name: ubuntu-22-systemd-arm64
164-
platform: arm64
165-
pre_build_image: true
166-
privileged: true
167-
volumes:
168-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
169-
- cgroupns_mode: host
170-
command: /lib/systemd/systemd
94+
95+
- <<: *common_amd64_platform_config
17196
image: docker.io/geerlingguy/docker-ubuntu2404-ansible:latest
17297
name: ubuntu-24-systemd-amd64
173-
platform: amd64
174-
pre_build_image: true
175-
privileged: true
176-
volumes:
177-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
178-
- cgroupns_mode: host
179-
command: /lib/systemd/systemd
98+
99+
- <<: *common_arm64_platform_config
180100
image: docker.io/geerlingguy/docker-ubuntu2404-ansible:latest
181101
name: ubuntu-24-systemd-arm64
182-
platform: arm64
183-
pre_build_image: true
184-
privileged: true
185-
volumes:
186-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
102+
187103
provisioner:
188104
name: ansible
189105
config_options:

.github/dependabot.yml

Lines changed: 13 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
@@ -21,9 +22,21 @@ updates:
2122
- dependency-name: hashicorp/setup-packer
2223
- dependency-name: hashicorp/setup-terraform
2324
- dependency-name: mxschmitt/action-tmate
25+
<<<<<<< HEAD
2426
# Managed by cisagov/skeleton-ansible-role
2527
- dependency-name: cisagov/action-disable-apparmor
2628
- dependency-name: docker/setup-buildx-action
29+
=======
30+
# # Managed by cisagov/skeleton-ansible-role
31+
# - dependency-name: cisagov/action-disable-apparmor
32+
# - dependency-name: docker/setup-buildx-action
33+
labels:
34+
# dependabot default we need to replicate
35+
- dependencies
36+
# This matches our label definition in .github/labels.yml as opposed to
37+
# dependabot's default of `github_actions`.
38+
- github-actions
39+
>>>>>>> 3260b69086d7e880c2f70a524857bbc72b59b44f
2740
package-ecosystem: github-actions
2841
schedule:
2942
interval: weekly

.github/labeler.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
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+
documentation:
28+
- changed-files:
29+
- any-glob-to-any-file:
30+
- "**/*.md"
31+
github-actions:
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- .github/workflows/**
35+
# Enable if Packer is used in the repository.
36+
# packer:
37+
# - changed-files:
38+
# - any-glob-to-any-file:
39+
# - "**/*.pkr.hcl"
40+
# Enable if Python is used in the repository.
41+
python:
42+
- changed-files:
43+
- any-glob-to-any-file:
44+
- "**/*.py"
45+
# Enable if Terraform is used in the repository.
46+
# terraform:
47+
# - changed-files:
48+
# - any-glob-to-any-file:
49+
# - "**/*.tf"
50+
test:
51+
- changed-files:
52+
- any-glob-to-any-file:
53+
# Add any test-related files or paths.
54+
- .ansible-lint
55+
- .bandit.yml
56+
- .config/molecule/config.yml
57+
- .flake8
58+
- .isort.cfg
59+
- .mdl_config.yaml
60+
- .yamllint
61+
- molecule/**
62+
upstream update:
63+
- head-branch:
64+
# Any Lineage pull requests should use this branch.
65+
- lineage/skeleton
66+
version bump:
67+
- changed-files:
68+
- any-glob-to-any-file:
69+
# Ensure this matches your version tracking file(s).
70+
- version.txt

.github/labels.yml

Lines changed: 6 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
@@ -50,6 +53,9 @@
5053
- color: fcdb45
5154
description: This pull request is awaiting an action or decision to move forward
5255
name: on hold
56+
- color: 3772a4
57+
description: Pull requests that update Python code
58+
name: python
5359
- color: ef476c
5460
description: This issue is a request for information or needs discussion
5561
name: question

0 commit comments

Comments
 (0)