Skip to content

Commit 716e019

Browse files
s1-nathangerharts1-nathangerhart
committed
refactor workflows for molecule 24.6
1 parent 6218326 commit 716e019

12 files changed

+329
-323
lines changed

‎.github/workflows/ci-lint.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ on:
33
workflow_call:
44
inputs:
55
role-path:
6-
description: 'Relative path to the role to be linted'
6+
description: "Relative path to the role to be linted"
77
type: string
88
required: true
99

1010
jobs:
1111
molecule-lint:
12-
name: 'ansible-${{ matrix.versions.ansible }} (Python: ${{ matrix.versions.python }})'
12+
name: "ansible-${{ matrix.versions.ansible }} (Python: ${{ matrix.versions.python }})"
1313
runs-on: [self-hosted, Linux, X64, ansible-collection]
1414
env:
1515
ANSIBLE_FORCE_COLOR: 1 # allows ansible colors to be passed to GitHub Actions
@@ -20,12 +20,14 @@ jobs:
2020
versions:
2121
# ansible-core upstream development supports 3 releases at a time
2222
# https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html
23-
- ansible: stable-2.12 # EOL 2023-05-23
24-
python: '3.10'
25-
- ansible: stable-2.13 # EOL 2023-11-06
26-
python: '3.10'
27-
- ansible: stable-2.14 # EOL 2024-05-20
28-
python: '3.10'
23+
# - ansible: stable-2.12 # EOL 2023-05-23
24+
# python: '3.10'
25+
# - ansible: stable-2.13 # EOL 2023-11-06
26+
# python: '3.10'
27+
# - ansible: stable-2.14 # EOL 2024-05-20
28+
# python: '3.10'
29+
- ansible: stable-2.16
30+
python: "3.12"
2931
steps:
3032
- name: Check out code
3133
uses: actions/checkout@v3

‎.github/workflows/ci-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
push:
66
tags:
7-
- '*.*.*'
7+
- "*.*.*"
88

99
permissions:
1010
contents: write
@@ -19,8 +19,8 @@ jobs:
1919
versions:
2020
# ansible-core upstream development supports 3 releases at a time
2121
# https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html
22-
- ansible: stable-2.14 # EOL 2024-05-20
23-
python: '3.10'
22+
- ansible: stable-2.16
23+
python: "3.12"
2424

2525
steps:
2626
- name: Check out code

‎.github/workflows/ci-test.yml

+18-15
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ on:
33
workflow_call:
44
inputs:
55
box-distribution:
6-
description: 'Vagrant Box Operating System'
6+
description: "Vagrant Box Operating System"
77
type: string
88
required: true
99
box-repository:
10-
description: 'Vagrant Box repository'
10+
description: "Vagrant Box repository"
1111
type: string
1212
required: true
1313
ansible-connection:
14-
description: 'Ansible connection type for connecting to the Box'
14+
description: "Ansible connection type for connecting to the Box"
1515
type: string
1616
required: false
1717
default: ssh
@@ -21,35 +21,38 @@ on:
2121
required: false
2222
default: Linux
2323
display-name:
24-
description: 'OS Name to display in workflow steps'
24+
description: "OS Name to display in workflow steps"
2525
type: string
2626
required: true
2727
scenario-name:
28-
description: 'Name of the molecule scenario to execute'
28+
description: "Name of the molecule scenario to execute"
2929
type: string
30-
required: false
31-
default: default
30+
required: true
31+
# default: default
3232
role-path:
33-
description: 'Relative path to the role to be linted'
33+
description: "Relative path to the role to be linted"
3434
type: string
3535
required: true
36+
default: extensions
3637

3738
jobs:
3839
molecule-test:
39-
name: 'ansible-${{ matrix.versions.ansible }} (Python: ${{ matrix.versions.python }})'
40+
name: "ansible-${{ matrix.versions.ansible }} (Python: ${{ matrix.versions.python }})"
4041
runs-on: [self-hosted, Linux, X64, ansible-collection]
4142
strategy:
4243
fail-fast: false
4344
matrix:
4445
versions:
4546
# ansible-core upstream development supports 3 releases at a time
4647
# https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html
47-
- ansible: stable-2.12 # EOL 2023-05-23
48-
python: '3.10'
49-
- ansible: stable-2.13 # EOL 2023-11-06
50-
python: '3.10'
51-
- ansible: stable-2.14 # EOL 2024-05-20
52-
python: '3.10'
48+
# - ansible: stable-2.12 # EOL 2023-05-23
49+
# python: '3.10'
50+
# - ansible: stable-2.13 # EOL 2023-11-06
51+
# python: '3.10'
52+
# - ansible: stable-2.14 # EOL 2024-05-20
53+
# python: '3.10'
54+
- ansible: stable-2.16
55+
python: "3.12"
5356
env:
5457
ANSIBLE_FORCE_COLOR: 1 # allows ansible colors to be passed to GitHub Actions
5558
PY_COLORS: 1 # allows molecule colors to be passed to GitHub Actions

‎.github/workflows/s1_agent_common.yml

+35-34
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,35 @@ name: S1 Agent Common
22
on:
33
push:
44
branches:
5-
- 'release/**'
5+
- "release/**"
66
paths:
7-
- 'roles/s1_agent_common/**'
8-
- '!roles/s1_agent_common/README.md'
9-
- '!roles/s1_agent_common/makefile'
10-
- '.github/workflows/s1_agent_common.yml'
11-
- '.github/workflows/ci-*.yml'
12-
- '!.github/workflows/ci-release.yml'
13-
- '!.github/workflows/ci-release.yml'
14-
- '.github/actions/ci-setup/action.yml'
15-
- 'requirements.yml'
7+
- "roles/s1_agent_common/**"
8+
- "!roles/s1_agent_common/README.md"
9+
- "!roles/s1_agent_common/makefile"
10+
- "extensions/molecule/common"
11+
- ".github/workflows/s1_agent_common.yml"
12+
- ".github/workflows/ci-*.yml"
13+
- "!.github/workflows/ci-release.yml"
14+
- "!.github/workflows/ci-release.yml"
15+
- ".github/actions/ci-setup/action.yml"
16+
- "requirements.yml"
1617
pull_request:
1718
branches:
18-
- 'main'
19+
- "main"
1920
types:
2021
- opened
2122
- synchronize
2223
- ready_for_review
2324
paths:
24-
- 'roles/s1_agent_common/**'
25-
- '!roles/s1_agent_common/README.md'
26-
- '!roles/s1_agent_common/makefile'
27-
- '.github/workflows/s1_agent_common.yml'
28-
- '.github/workflows/ci-*.yml'
29-
- '!.github/workflows/ci-release.yml'
30-
- '.github/actions/ci-setup/actions.yml'
31-
- 'requirements.yml'
25+
- "roles/s1_agent_common/**"
26+
- "!roles/s1_agent_common/README.md"
27+
- "!roles/s1_agent_common/makefile"
28+
- "extensions/molecule/common"
29+
- ".github/workflows/s1_agent_common.yml"
30+
- ".github/workflows/ci-*.yml"
31+
- "!.github/workflows/ci-release.yml"
32+
- ".github/actions/ci-setup/actions.yml"
33+
- "requirements.yml"
3234
workflow_dispatch:
3335
concurrency:
3436
group: ${{ github.workflow }}-${{ github.ref }}
@@ -41,7 +43,7 @@ jobs:
4143
role-path: ./roles/s1_agent_common
4244

4345
call-ci-test:
44-
name: 'Test: ${{ matrix.boxes.display_name }} (${{ matrix.scenario-name }})'
46+
name: "Test: ${{ matrix.boxes.display_name }} (${{ matrix.scenario-name }})"
4547
needs: call-ci-lint
4648
uses: ./.github/workflows/ci-test.yml
4749
strategy:
@@ -61,28 +63,27 @@ jobs:
6163
display_name: Server 2022
6264
connection: ssh
6365
group: Windows
64-
- distribution: WindowsServer2012R2
65-
repository: jborean93
66-
display_name: Server 2012r2
67-
connection: winrm
66+
# - distribution: WindowsServer2012R2
67+
# repository: jborean93
68+
# display_name: Server 2012r2
69+
# connection: winrm
6870
scenario-name:
69-
- default
70-
- winrm_default
71-
exclude:
72-
# OpenSSH is not supported on Windows Server 2012r2. We need to use
73-
# custom scenarios configured for winrm connections. Exclude normal
74-
# scenarios for winrm connections and winrm_* scenarios for ssh
75-
# connections.
76-
- { boxes: { connection: winrm }, scenario-name: default }
77-
- { boxes: { connection: ssh }, scenario-name: winrm_default }
71+
- common
72+
# exclude:
73+
# # OpenSSH is not supported on Windows Server 2012r2. We need to use
74+
# # custom scenarios configured for winrm connections. Exclude normal
75+
# # scenarios for winrm connections and winrm_* scenarios for ssh
76+
# # connections.
77+
# - { boxes: { connection: winrm }, scenario-name: default }
78+
# - { boxes: { connection: ssh }, scenario-name: winrm_default }
7879
with:
7980
box-distribution: ${{ matrix.boxes.distribution }}
8081
box-repository: ${{ matrix.boxes.repository }}
8182
ansible-connection: ${{ matrix.boxes.connection }}
8283
ansible-group: ${{ matrix.boxes.group }}
8384
display-name: ${{ matrix.boxes.display_name }}
8485
scenario-name: ${{ matrix.scenario-name }}
85-
role-path: ./roles/s1_agent_common
86+
# role-path: ./roles/s1_agent_common
8687
secrets: inherit
8788

8889
call-ci-assert:

‎.github/workflows/s1_agent_download.yml

+34-33
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,34 @@ name: S1 Agent Download
22
on:
33
push:
44
branches:
5-
- 'release/**'
5+
- "release/**"
66
paths:
7-
- 'roles/s1_agent_download/**'
8-
- '!roles/s1_agent_download/README.md'
9-
- '!roles/s1_agent_download/makefile'
10-
- '.github/workflows/s1_agent_download.yml'
11-
- '.github/workflows/ci-*.yml'
12-
- '!.github/workflows/ci-release.yml'
13-
- '.github/actions/ci-setup/action.yml'
14-
- 'requirements.yml'
7+
- "roles/s1_agent_download/**"
8+
- "!roles/s1_agent_download/README.md"
9+
- "!roles/s1_agent_download/makefile"
10+
- "extensions/molecule/download"
11+
- ".github/workflows/s1_agent_download.yml"
12+
- ".github/workflows/ci-*.yml"
13+
- "!.github/workflows/ci-release.yml"
14+
- ".github/actions/ci-setup/action.yml"
15+
- "requirements.yml"
1516
pull_request:
1617
branches:
17-
- 'main'
18+
- "main"
1819
types:
1920
- opened
2021
- synchronize
2122
- ready_for_review
2223
paths:
23-
- 'roles/s1_agent_download/**'
24-
- '!roles/s1_agent_download/README.md'
25-
- '!roles/s1_agent_download/makefile'
26-
- '.github/workflows/s1_agent_download.yml'
27-
- '.github/workflows/ci-*.yml'
28-
- '!.github/workflows/ci-release.yml'
29-
- '.github/actions/ci-setup/actions.yml'
30-
- 'requirements.yml'
24+
- "roles/s1_agent_download/**"
25+
- "!roles/s1_agent_download/README.md"
26+
- "!roles/s1_agent_download/makefile"
27+
- "extensions/molecule/download"
28+
- ".github/workflows/s1_agent_download.yml"
29+
- ".github/workflows/ci-*.yml"
30+
- "!.github/workflows/ci-release.yml"
31+
- ".github/actions/ci-setup/actions.yml"
32+
- "requirements.yml"
3133
workflow_dispatch:
3234
concurrency:
3335
group: ${{ github.workflow }}-${{ github.ref }}
@@ -40,7 +42,7 @@ jobs:
4042
role-path: ./roles/s1_agent_download
4143

4244
call-ci-test:
43-
name: 'Test: ${{ matrix.boxes.display_name }} (${{ matrix.scenario-name }})'
45+
name: "Test: ${{ matrix.boxes.display_name }} (${{ matrix.scenario-name }})"
4446
needs: call-ci-lint
4547
uses: ./.github/workflows/ci-test.yml
4648
strategy:
@@ -60,28 +62,27 @@ jobs:
6062
display_name: Server 2022
6163
connection: ssh
6264
group: Windows
63-
- distribution: WindowsServer2012R2
64-
repository: jborean93
65-
display_name: Server 2012r2
66-
connection: winrm
65+
# - distribution: WindowsServer2012R2
66+
# repository: jborean93
67+
# display_name: Server 2012r2
68+
# connection: winrm
6769
scenario-name:
68-
- default
69-
- winrm_default
70-
exclude:
71-
# OpenSSH is not supported on Windows Server 2012r2. We need to use
72-
# custom scenarios configured for winrm connections. Exclude normal
73-
# scenarios for winrm connections and winrm_* scenarios for ssh
74-
# connections.
75-
- { boxes: { connection: winrm }, scenario-name: default }
76-
- { boxes: { connection: ssh }, scenario-name: winrm_default }
70+
- download
71+
# exclude:
72+
# # OpenSSH is not supported on Windows Server 2012r2. We need to use
73+
# # custom scenarios configured for winrm connections. Exclude normal
74+
# # scenarios for winrm connections and winrm_* scenarios for ssh
75+
# # connections.
76+
# - { boxes: { connection: winrm }, scenario-name: default }
77+
# - { boxes: { connection: ssh }, scenario-name: winrm_default }
7778
with:
7879
box-distribution: ${{ matrix.boxes.distribution }}
7980
box-repository: ${{ matrix.boxes.repository }}
8081
ansible-connection: ${{ matrix.boxes.connection }}
8182
ansible-group: ${{ matrix.boxes.group }}
8283
display-name: ${{ matrix.boxes.display_name }}
8384
scenario-name: ${{ matrix.scenario-name }}
84-
role-path: ./roles/s1_agent_download
85+
# role-path: ./roles/s1_agent_download
8586
secrets: inherit
8687

8788
call-ci-assert:

0 commit comments

Comments
 (0)