Skip to content

Commit 0a22258

Browse files
enrico-usaienrico-usai
authored
Merge branch 'develop' into wip/mgiacomo/develop/utilities/update-cookbook-deps
2 parents 446d28e + 3f75f2c commit 0a22258

File tree

1,457 files changed

+39998
-17361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,457 files changed

+39998
-17361
lines changed

‎.bandit.ini‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
# B105 checks for potentially hard-coded passwords/API tokens.
2-
# It's disabled because it seems to have a high rate of false failures.
3-
# B404 checks for imports of the subprocess module.
4-
# It's disabled because we make use of that module.
5-
skips: ['B105', 'B404']
1+
skips: []

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
./.github
2+
./.tox

‎.flake8‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
[flake8]
22
ignore =
3-
D100, # Missing docstring in public module
4-
D104, # Missing docstring in public package
5-
D107, # Missing docstring in __init__
6-
D103, # Missing docstring in public function
7-
W503, # line break before binary operator => Conflicts with black style.
8-
D413, # Missing blank line after last section
3+
# D100: Missing docstring in public module
4+
D100,
5+
# D104: Missing docstring in public package
6+
D104,
7+
# D107: Missing docstring in __init__
8+
D107,
9+
# D103: Missing docstring in public function
10+
D103,
11+
# W503: line break before binary operator => Conflicts with black style.
12+
W503,
13+
# D413: Missing blank line after last section
14+
D413,
15+
# B028: Consider replacing f"'{foo}'" with f"{foo!r}".
16+
# Currently being disabled by flake8-bugbear. See https://github.com/PyCQA/flake8-bugbear/pull/333
17+
B028
918
exclude =
1019
.tox,
1120
.git,
@@ -22,4 +31,4 @@ max-complexity = 10
2231
max-line-length = 120
2332
import-order-style = google
2433
application-import-names = flake8
25-
format = ${cyan}%(path)s${reset}:${yellow_bold}%(row)d${reset}:${green_bold}%(col)d${reset}: ${red_bold}%(code)s${reset} %(text)s
34+
format = %(cyan)s%(path)s%(reset)s:%(bold)s%(yellow)s%(row)d%(reset)s:%(bold)s%(green)s%(col)d%(reset)s: %(bold)s%(red)s%(code)s%(reset)s %(text)s

‎.gitattributes‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/spec export-ignore
2-
/test export-ignore
2+
/test/unit export-ignore
3+
/test/integration export-ignore
34
.kitchen* export-ignore
45
.gitattributes export-ignore
5-
.gitignore export-ignore
6+
.gitignore export-ignore

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @aws/aws-parallelcluster-admins
1+
* @aws/aws-parallelcluster-admins @aws/aws-parallelcluster-maintainers

‎.github/workflows/changelog_enforcer.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
changelog:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@main
1212
- uses: dangoslen/[email protected]
1313
with:
1414
changeLogPath: CHANGELOG.md

‎.github/workflows/ci.yml‎

Lines changed: 54 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
name: DepCheck
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@main
1111
- name: Dependency Check
1212
uses: dependency-check/Dependency-Check_Action@main
1313
with:
@@ -31,9 +31,9 @@ jobs:
3131
- name: Setup Ruby
3232

3333
steps:
34-
- uses: actions/checkout@v2
34+
- uses: actions/checkout@main
3535
- name: Setup Ruby
36-
uses: actions/setup-ruby@v1
36+
uses: ruby/setup-ruby@v1
3737
with:
3838
ruby-version: 2.7
3939
- name: Install dependencies
@@ -47,30 +47,34 @@ jobs:
4747
matrix:
4848
os: [ubuntu-latest]
4949
name:
50-
- Python 3.6 Tests
5150
- Python 3.7 Tests
5251
- Python 3.8 Tests
5352
- Python 3.9 Tests
53+
- Python 3.10 Tests
54+
- Python 3.10 Tests Coverage
5455
- Code Checks
5556
include:
56-
- name: Python 3.6 Tests
57-
python: 3.6
58-
toxenv: py36
5957
- name: Python 3.7 Tests
6058
python: 3.7
61-
toxenv: py37
59+
toxenv: py37-nocov
6260
- name: Python 3.8 Tests
6361
python: 3.8
64-
toxenv: py38
62+
toxenv: py38-nocov
6563
- name: Python 3.9 Tests
6664
python: 3.9
67-
toxenv: py39
65+
toxenv: py39-nocov
66+
- name: Python 3.10 Tests
67+
python: '3.10'
68+
toxenv: py310-nocov
69+
- name: Python 3.10 Tests Coverage
70+
python: '3.10'
71+
toxenv: py310-cov
6872
- name: Code Checks
69-
python: 3.9
73+
python: '3.10'
7074
toxenv: code-linters
7175

7276
steps:
73-
- uses: actions/checkout@v2
77+
- uses: actions/checkout@main
7478
- name: Setup Python
7579
uses: actions/setup-python@v2
7680
with:
@@ -79,3 +83,41 @@ jobs:
7983
run: pip install tox
8084
- name: Run Tox
8185
run: tox -e ${{ matrix.toxenv }}
86+
- name: Upload code coverage report to Codecov
87+
uses: codecov/codecov-action@v3
88+
if: ${{ endsWith(matrix.toxenv, '-cov') }}
89+
with:
90+
files: coverage.xml
91+
flags: unittests
92+
verbose: true
93+
shellcheck:
94+
name: Shellcheck
95+
runs-on: ubuntu-latest
96+
steps:
97+
- uses: actions/checkout@main
98+
- name: Run ShellCheck
99+
uses: ludeeus/action-shellcheck@master
100+
with:
101+
severity: error
102+
ignore_paths: third-party
103+
rspec:
104+
name: ChefSpec
105+
runs-on: ubuntu-latest
106+
strategy:
107+
fail-fast: false
108+
matrix:
109+
cookbook:
110+
- cookbooks/aws-parallelcluster-common
111+
- cookbooks/aws-parallelcluster-install
112+
- cookbooks/aws-parallelcluster-config
113+
steps:
114+
- uses: actions/checkout@main
115+
- uses: actionshub/chef-install@main
116+
with:
117+
version: 22.10.1013
118+
- name: Run ChefSpec on ${{ matrix.cookbook }}
119+
run: |
120+
cd ${{ matrix.cookbook }}
121+
chef exec rspec
122+
env:
123+
CHEF_LICENSE: accept-no-persist

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
language: [ 'python' ]
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@main
2424
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@v1
25+
uses: github/codeql-action/init@v2
2626
with:
2727
languages: ${{ matrix.language }}
2828
queries: +security-and-quality
2929
- name: Perform CodeQL Analysis
30-
uses: github/codeql-action/analyze@v1
30+
uses: github/codeql-action/analyze@v2

‎.github/workflows/dokken-unit-tests.yml‎

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
name: ParallelCluster Cookbook Unit Tests on Docker
2+
3+
on: [workflow_dispatch]
4+
5+
jobs:
6+
dokken-common-recipes:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
matrix:
10+
os: &os-list
11+
- alinux2
12+
- centos7
13+
- ubuntu18
14+
- ubuntu20
15+
- rhel8
16+
suite:
17+
- setup-envars
18+
fail-fast: false
19+
steps:
20+
- name: Check out code
21+
uses: actions/checkout@main
22+
- name: Install Chef
23+
uses: actionshub/chef-install@main
24+
- name: Test-Kitchen
25+
uses: actionshub/test-kitchen@main
26+
with:
27+
os: ${{ matrix.os }}
28+
suite: ${{ matrix.suite }}
29+
env:
30+
CHEF_LICENSE: accept-no-persist
31+
KITCHEN_YAML: kitchen.docker.yml
32+
KITCHEN_LOCAL_YAML: cookbooks/aws-parallelcluster-common/kitchen.recipes.yml
33+
KITCHEN_GLOBAL_YAML: kitchen.global.yml
34+
continue-on-error: false
35+
dokken-common-resources:
36+
runs-on: ubuntu-latest
37+
strategy:
38+
matrix:
39+
os: *os-list
40+
suite:
41+
- package-repos
42+
- lustre-installation
43+
fail-fast: false
44+
steps:
45+
- name: Check out code
46+
uses: actions/checkout@main
47+
- name: Install Chef
48+
uses: actionshub/chef-install@main
49+
- name: Test-Kitchen
50+
uses: actionshub/test-kitchen@main
51+
with:
52+
os: ${{ matrix.os }}
53+
suite: ${{ matrix.suite }}
54+
env:
55+
CHEF_LICENSE: accept-no-persist
56+
KITCHEN_YAML: kitchen.docker.yml
57+
KITCHEN_LOCAL_YAML: cookbooks/aws-parallelcluster-common/kitchen.resources.yml
58+
KITCHEN_GLOBAL_YAML: kitchen.global.yml
59+
continue-on-error: false
60+
dokken-recipes-install:
61+
runs-on: ubuntu-latest
62+
strategy:
63+
matrix:
64+
os: *os-list
65+
suite:
66+
- sudo
67+
- users
68+
- directories
69+
- ephemeral-drives-setup
70+
- python-setup
71+
- cfn-bootstrap-setup
72+
- node-setup
73+
- supervisord-setup
74+
- awscli
75+
- clusterstatusmgtd
76+
- cron
77+
- chrony
78+
- disable-selinux
79+
- openssh
80+
- gc-thresh-values
81+
- cfnconfig-mixed
82+
- clusterstatusmgtd-init-slurm
83+
- mount-shared
84+
- ami-cleanup
85+
- disable-services
86+
- license-readme
87+
- pmix-installed
88+
- jwt-installed
89+
#- install-slurm
90+
fail-fast: false
91+
steps:
92+
- name: Check out code
93+
uses: actions/checkout@main
94+
- name: Install Chef
95+
uses: actionshub/chef-install@main
96+
- name: Test-Kitchen
97+
uses: actionshub/test-kitchen@main
98+
with:
99+
suite: ${{ matrix.suite }}
100+
os: ${{ matrix.os }}
101+
env:
102+
CHEF_LICENSE: accept-no-persist
103+
KITCHEN_YAML: kitchen.docker.yml
104+
KITCHEN_LOCAL_YAML: kitchen.recipes-install.yml
105+
KITCHEN_GLOBAL_YAML: kitchen.global.yml
106+
continue-on-error: false
107+
dokken-recipes-configure:
108+
runs-on: ubuntu-latest
109+
strategy:
110+
matrix:
111+
os:
112+
- alinux2
113+
- centos7
114+
- ubuntu18
115+
- ubuntu20
116+
- rhel8
117+
suite:
118+
- fs-update
119+
- fs-update-default-values
120+
- nfs-configured
121+
- networking-configured
122+
- ssh-target-checker
123+
- ephemeral-drives-mounted
124+
- ephemeral-drives-skipped
125+
- sudo-configured
126+
- /chrony-configured/
127+
fail-fast: false
128+
steps:
129+
- name: Check out code
130+
uses: actions/checkout@main
131+
- name: Install Chef
132+
uses: actionshub/chef-install@main
133+
- name: Test-Kitchen
134+
uses: actionshub/test-kitchen@main
135+
with:
136+
suite: ${{ matrix.suite }}
137+
os: ${{ matrix.os }}
138+
env:
139+
CHEF_LICENSE: accept-no-persist
140+
KITCHEN_YAML: kitchen.docker.yml
141+
KITCHEN_LOCAL_YAML: kitchen.recipes-config.yml
142+
KITCHEN_GLOBAL_YAML: kitchen.global.yml
143+
continue-on-error: false
144+
dokken-resources-install:
145+
runs-on: ubuntu-latest
146+
strategy:
147+
matrix:
148+
os: *os-list
149+
suite:
150+
- install-packages
151+
- c-states
152+
- ec2-udev-rules
153+
- mysql-client
154+
- nfs
155+
- slurm-dependencies
156+
- jwt-dependencies
157+
- efa-setup
158+
- munge
159+
- stunnel-installed
160+
fail-fast: false
161+
steps:
162+
- name: Check out code
163+
uses: actions/checkout@main
164+
- name: Install Chef
165+
uses: actionshub/chef-install@main
166+
- name: Test-Kitchen
167+
uses: actionshub/test-kitchen@main
168+
with:
169+
suite: ${{ matrix.suite }}
170+
os: ${{ matrix.os }}
171+
env:
172+
CHEF_LICENSE: accept-no-persist
173+
KITCHEN_YAML: kitchen.docker.yml
174+
KITCHEN_LOCAL_YAML: kitchen.resources-install.yml
175+
KITCHEN_GLOBAL_YAML: kitchen.global.yml
176+
continue-on-error: false
177+
dokken-resources-configure:
178+
runs-on: ubuntu-latest
179+
strategy:
180+
matrix:
181+
os: *os-list
182+
suite:
183+
- sticky-bits
184+
- efa-configure-compute
185+
fail-fast: false
186+
steps:
187+
- name: Check out code
188+
uses: actions/checkout@main
189+
- name: Install Chef
190+
uses: actionshub/chef-install@main
191+
- name: Test-Kitchen
192+
uses: actionshub/test-kitchen@main
193+
with:
194+
suite: ${{ matrix.suite }}
195+
os: ${{ matrix.os }}
196+
env:
197+
CHEF_LICENSE: accept-no-persist
198+
KITCHEN_YAML: kitchen.docker.yml
199+
KITCHEN_LOCAL_YAML: kitchen.resources-config.yml
200+
KITCHEN_GLOBAL_YAML: kitchen.global.yml
201+
continue-on-error: false

0 commit comments

Comments
 (0)