Skip to content

Commit b0c9774

Browse files
richp405richp405
authored
Merge branch 'dev' into bug/1940/mount_handle_fsumf168
2 parents f9de6d5 + 2e70099 commit b0c9774

33 files changed

+76
-8175
lines changed

‎.github/workflows/ac-ansible-test-sanity.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: AC Ansible sanity
1+
name: Ansible sanity testing
22

33
on:
44
pull_request:
@@ -57,17 +57,18 @@ jobs:
5757
run: |
5858
python -m pip install --upgrade pip
5959
pip install virtualenv
60-
mkdir venv
61-
virtualenv venv/venv-2.18
60+
virtualenv venv
6261
6362
- name: Install dependencies
6463
run: |
65-
source venv/venv-2.18/bin/activate
64+
source venv/bin/activate
6665
python -m pip install --upgrade pip
6766
pip install "ansible-core>=2.18,<2.19"
6867
6968
- name: Run ac-sanity
7069
run: |
71-
source venv/venv-2.18/bin/activate
72-
./ac --ac-build
73-
./ac --ac-sanity
70+
source venv/bin/activate
71+
rm -rf ibm-ibm_zos_core-*.tar.gz
72+
ansible-galaxy collection build
73+
ansible-galaxy collection install -f ibm-ibm_zos_core-*
74+
cd ~/.ansible/collections/ansible_collections/ibm/ibm_zos_core && ansible-test sanity --python 3.12 --requirements

‎.github/workflows/ac-bandit.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: AC Bandit
1+
name: Bandit Scan
22

33
on:
44
pull_request:
@@ -21,22 +21,21 @@ jobs:
2121
- name: Set up Python
2222
uses: actions/setup-python@v5
2323
with:
24-
python-version: 3.11
24+
python-version: 3.12
2525

2626
- name: Set up venv
2727
run: |
2828
python -m pip install --upgrade pip
2929
pip install virtualenv
30-
mkdir venv
31-
virtualenv venv/venv-2.16
30+
virtualenv venv
3231
3332
- name: Install dependencies
3433
run: |
35-
source venv/venv-2.16/bin/activate
34+
source venv/bin/activate
3635
python -m pip install --upgrade pip
3736
pip install bandit
3837
3938
- name: Run ac-bandit
4039
run: |
41-
source venv/venv-2.16/bin/activate
42-
./ac --ac-bandit --level l
40+
source venv/bin/activate
41+
python3 -m bandit -r plugins/* -l

‎.github/workflows/ac-galaxy-importer.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: AC Galaxy Importer
1+
name: Galaxy Importer Check
22

33
on:
44
pull_request:
@@ -49,24 +49,32 @@ jobs:
4949
- name: Set up Python
5050
uses: actions/setup-python@v5
5151
with:
52-
python-version: 3.11
52+
python-version: 3.12
5353

5454
- name: Set up venv
5555
run: |
5656
python -m pip install --upgrade pip
5757
pip install virtualenv
58-
mkdir venv
59-
virtualenv venv/venv-2.16
58+
virtualenv venv
6059
6160
- name: Install dependencies
6261
run: |
63-
source venv/venv-2.16/bin/activate
62+
source venv/bin/activate
6463
python -m pip install --upgrade pip
6564
pip install ansible
6665
pip install ansible-importer
6766
pip install galaxy-importer
6867
6968
- name: Run ac-galaxy-importer
7069
run: |
71-
source venv/venv-2.16/bin/activate
72-
./ac --ac-galaxy-importer
70+
source venv/bin/activate
71+
export FLAKE8_IGNORE=`cat ${GALAXY_IMPORTER_CONFIG} | grep -i "ignore = " | cut -d "=" -f 2 | tr -d ' '`
72+
cp $ORIGINAL_CONSTANTS_DIR/constants.py /tmp/
73+
sed "s/E402/$FLAKE8_IGNORE/" ${ORIGINAL_CONSTANTS_DIR}/constants.py > ${ORIGINAL_CONSTANTS_DIR}/constants.py.tmp
74+
mv ${ORIGINAL_CONSTANTS_DIR}/constants.py.tmp ${ORIGINAL_CONSTANTS_DIR}/constants.py
75+
rm -rf ibm-ibm_zos_core-*.tar.gz
76+
ansible-galaxy collection build --force
77+
python3 -m galaxy_importer.main ibm-ibm_zos_core-*.tar.gz
78+
env:
79+
ORIGINAL_CONSTANTS_DIR: venv/lib/python3.12/site-packages/galaxy_importer
80+
GALAXY_IMPORTER_CONFIG: .github/workflows/galaxy-importer.cfg

‎.github/workflows/ac-module-doc.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: AC Module Doc
1+
name: Module Doc Check
22

33
on:
44
pull_request:
@@ -19,24 +19,25 @@ jobs:
1919
- name: Set up python
2020
uses: actions/setup-python@v5
2121
with:
22-
python-version: 3.11
22+
python-version: 3.12
2323

2424
- name: Set up venv
2525
run: |
2626
python -m pip install --upgrade pip
2727
pip install virtualenv
28-
mkdir venv
29-
virtualenv venv/venv-2.16
28+
virtualenv venv
3029
3130
- name: Install dependencies
3231
run: |
33-
source venv/venv-2.16/bin/activate
32+
source venv/bin/activate
3433
pip install ansible
3534
pip install ansible-doc-extractor
3635
3736
- name: Run ac-module-doc
3837
run: |
39-
source venv/venv-2.16/bin/activate
38+
source venv/bin/activate
4039
export ANSIBLE_LIBRARY=/home/runner/work/ibm_zos_core/ibm_zos_core/plugins/modules/
41-
./ac --ac-build
42-
./ac --ac-module-doc
40+
rm -rf ibm-ibm_zos_core-*.tar.gz
41+
ansible-galaxy collection build
42+
ansible-galaxy collection install -f ibm-ibm_zos_core-*
43+
cd docs && make clean && make module-doc

‎.github/workflows/ac_changelog.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: AC Changelog Lint
1+
name: Changelog Lint Check
22

33
on:
44
pull_request:
@@ -21,21 +21,20 @@ jobs:
2121
- name: Set up python
2222
uses: actions/setup-python@v5
2323
with:
24-
python-version: 3.11
24+
python-version: 3.12
2525

2626
- name: Set up venv
2727
run: |
2828
python -m pip install --upgrade pip
2929
pip install virtualenv
30-
mkdir venv
31-
virtualenv venv/venv-2.16
30+
virtualenv venv
3231
3332
- name: Install dependencies
3433
run: |
35-
source venv/venv-2.16/bin/activate
34+
source venv/bin/activate
3635
pip install antsibull-changelog
3736
38-
- name: Run ac-changelog
37+
- name: Run antsibull-changelog
3938
run: |
40-
source venv/venv-2.16/bin/activate
41-
./ac --ac-changelog --command lint
39+
source venv/bin/activate
40+
antsibull-changelog lint

‎.github/workflows/galaxy-importer.cfg

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[galaxy-importer]
2+
LOG_LEVEL_MAIN = INFO
3+
RUN_ANSIBLE_TEST = False
4+
ANSIBLE_LOCAL_TMP = '~/.ansible/tmp'
5+
RUN_FLAKE8 = True
6+
7+
[flake8]
8+
exclude =
9+
./galaxy_importer.egg-info/*,
10+
./build/*,
11+
./dist/*
12+
./.git/*
13+
./.env/*,
14+
./.venv/*,
15+
./.pytest_cache/*,
16+
17+
ignore = E402,W503,W504
18+
19+
# Flake8 codes
20+
# --------------------
21+
# W503: This enforces operators before line breaks which is not pep8 or black compatible.
22+
# W504: This enforces operators after line breaks which is not pep8 or black compatible.
23+
# E402: This enforces module level imports at the top of the file.
24+
25+

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,9 @@ venv.bak/
256256
info.env
257257
shell_exploits.txt
258258
importer_result.json
259+
ac
260+
scripts/
261+
ansible.cfg
259262

260263
################################################################################
261264
# Debugging .ignore, if you want to know why a particular file is being ignored

0 commit comments

Comments
 (0)