Skip to content

Commit 847db33

Browse files
author
jsf9k
committed
# Conflicts: # .config/molecule/config.yml # .github/dependabot.yml # .github/workflows/build.yml # meta/main.yml
2 parents 127f21e + 3260b69 commit 847db33

File tree

14 files changed

+294
-151
lines changed

14 files changed

+294
-151
lines changed

‎.config/molecule/config.yml‎

Lines changed: 57 additions & 113 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,64 +14,36 @@ 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
46+
<<<<<<< HEAD
7447
platform: arm64
7548
pre_build_image: true
7649
privileged: true
@@ -98,94 +71,65 @@ platforms:
9871
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
9972
- cgroupns_mode: host
10073
command: /lib/systemd/systemd
74+
=======
75+
76+
- <<: *common_amd64_platform_config
77+
image: docker.io/geerlingguy/docker-debian13-ansible:latest
78+
name: debian13-systemd-amd64
79+
80+
- <<: *common_arm64_platform_config
81+
image: docker.io/geerlingguy/docker-debian13-ansible:latest
82+
name: debian13-systemd-arm64
83+
84+
- <<: *common_amd64_platform_config
85+
image: docker.io/cisagov/docker-debian14-ansible:latest
86+
name: debian14-systemd-amd64
87+
88+
- <<: *common_arm64_platform_config
89+
image: docker.io/cisagov/docker-debian14-ansible:latest
90+
name: debian14-systemd-arm64
91+
92+
- <<: *common_amd64_platform_config
93+
>>>>>>> 3260b69086d7e880c2f70a524857bbc72b59b44f
10194
image: docker.io/cisagov/docker-kali-ansible:latest
10295
name: kali-systemd-amd64
103-
platform: amd64
104-
pre_build_image: true
105-
privileged: true
106-
volumes:
107-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
108-
- cgroupns_mode: host
109-
command: /lib/systemd/systemd
96+
97+
- <<: *common_arm64_platform_config
11098
image: docker.io/cisagov/docker-kali-ansible:latest
11199
name: kali-systemd-arm64
112-
platform: arm64
113-
pre_build_image: true
114-
privileged: true
115-
volumes:
116-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
117-
- cgroupns_mode: host
118-
command: /lib/systemd/systemd
100+
101+
- <<: *common_amd64_platform_config
119102
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
120103
name: fedora41-systemd-amd64
121-
platform: amd64
122-
pre_build_image: true
123-
privileged: true
124-
volumes:
125-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
126-
- cgroupns_mode: host
127-
command: /lib/systemd/systemd
104+
105+
- <<: *common_arm64_platform_config
128106
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
129107
name: fedora41-systemd-arm64
130-
platform: arm64
131-
pre_build_image: true
132-
privileged: true
133-
volumes:
134-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
135-
- cgroupns_mode: host
136-
command: /lib/systemd/systemd
108+
109+
- <<: *common_amd64_platform_config
137110
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
138111
name: fedora42-systemd-amd64
139-
platform: amd64
140-
pre_build_image: true
141-
privileged: true
142-
volumes:
143-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
144-
- cgroupns_mode: host
145-
command: /lib/systemd/systemd
112+
113+
- <<: *common_arm64_platform_config
146114
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
147115
name: fedora42-systemd-arm64
148-
platform: arm64
149-
pre_build_image: true
150-
privileged: true
151-
volumes:
152-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
153-
- cgroupns_mode: host
154-
command: /lib/systemd/systemd
116+
117+
- <<: *common_amd64_platform_config
155118
image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
156119
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
120+
121+
- <<: *common_arm64_platform_config
164122
image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
165123
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
124+
125+
- <<: *common_amd64_platform_config
173126
image: docker.io/geerlingguy/docker-ubuntu2404-ansible:latest
174127
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
128+
129+
- <<: *common_arm64_platform_config
182130
image: docker.io/geerlingguy/docker-ubuntu2404-ansible:latest
183131
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
132+
189133
provisioner:
190134
name: ansible
191135
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

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@ jobs:
9999
# this workflow.
100100
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
101101
- id: setup-env
102-
uses: cisagov/setup-env-github-action@develop
103-
- uses: actions/checkout@v4
102+
uses: cisagov/setup-env-github-action@v1
103+
- uses: actions/checkout@v5
104104
- id: setup-python
105-
uses: actions/setup-python@v5
105+
uses: actions/setup-python@v6
106106
with:
107107
python-version: ${{ steps.setup-env.outputs.python-version }}
108108
# We need the Go version and Go cache location for the actions/cache step,
109109
# so the Go installation must happen before that.
110110
- id: setup-go
111-
uses: actions/setup-go@v5
111+
uses: actions/setup-go@v6
112112
with:
113113
# There is no expectation for actual Go code so we disable caching as
114114
# it relies on the existence of a go.sum file.
@@ -220,10 +220,15 @@ jobs:
220220
- debian10-systemd
221221
- debian11-systemd
222222
- debian12-systemd
223+
<<<<<<< HEAD
223224
# Docker does not yet officially support Debian Trixie. See
224225
# https://docs.docker.com/engine/install/debian/ for more
225226
# details.
226227
# - debian13-systemd
228+
=======
229+
- debian13-systemd
230+
- debian14-systemd
231+
>>>>>>> 3260b69086d7e880c2f70a524857bbc72b59b44f
227232
- fedora41-systemd
228233
- fedora42-systemd
229234
- kali-systemd
@@ -259,10 +264,10 @@ jobs:
259264
# this workflow.
260265
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
261266
- id: setup-env
262-
uses: cisagov/setup-env-github-action@develop
263-
- uses: actions/checkout@v4
267+
uses: cisagov/setup-env-github-action@v1
268+
- uses: actions/checkout@v5
264269
- id: setup-python
265-
uses: actions/setup-python@v5
270+
uses: actions/setup-python@v6
266271
with:
267272
python-version: ${{ steps.setup-env.outputs.python-version }}
268273
- uses: actions/cache@v4

0 commit comments

Comments
 (0)