Skip to content

Commit f26729c

Browse files
authored
Bring CI/CD up to date and resolve Python 3 cryptography issue (#250)
1 parent de262dc commit f26729c

File tree

17 files changed

+77
-40
lines changed

17 files changed

+77
-40
lines changed

.ansible-lint

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
2+
exclude_paths:
3+
- .github/
24
offline: true
35
skip_list:
4-
- args[module]
56
- name[template]
7+
- schema[meta]
68
- yaml[line-length]

.github/release-drafter.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
name-template: "$RESOLVED_VERSION"
33
tag-template: "$RESOLVED_VERSION"
4+
include-pre-releases: true
45
categories:
56
- title: "💣 Breaking Changes"
67
labels:

.github/workflows/galaxy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Check out the codebase
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Set up Python 3
17-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: 3.x
2020

.github/workflows/molecule.yml

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,36 @@ on:
1313
- cron: "0 0 1 * *"
1414
workflow_dispatch:
1515
jobs:
16+
ansible-lint:
17+
name: Ansible Lint
18+
runs-on: ubuntu-22.04
19+
steps:
20+
- name: Check out the codebase
21+
uses: actions/checkout@v4
22+
23+
- name: Set up Python 3
24+
uses: actions/setup-python@v5
25+
with:
26+
python-version: 3.x
27+
28+
- name: Install Ansible Lint
29+
run: pip3 install -r .github/workflows/requirements/requirements_ansible_lint.txt
30+
31+
- name: Install Ansible collection dependencies
32+
run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml
33+
34+
- name: Run Ansible Lint
35+
run: ansible-lint --force-color
36+
1637
molecule:
1738
name: Molecule
1839
runs-on: ubuntu-22.04
40+
needs: ansible-lint
41+
env:
42+
NGINX_CRT: ${{ secrets.NGINX_CRT }}
43+
NGINX_KEY: ${{ secrets.NGINX_KEY }}
44+
RHEL_USERNAME: ${{ secrets.RHEL_USERNAME }}
45+
RHEL_PASSWORD: ${{ secrets.RHEL_PASSWORD }}
1946
strategy:
2047
fail-fast: false
2148
matrix:
@@ -27,10 +54,10 @@ jobs:
2754
- uninstall
2855
steps:
2956
- name: Check out the codebase
30-
uses: actions/checkout@v3
57+
uses: actions/checkout@v4
3158

3259
- name: Set up Python 3
33-
uses: actions/setup-python@v4
60+
uses: actions/setup-python@v5
3461
with:
3562
python-version: 3.x
3663

@@ -46,7 +73,4 @@ jobs:
4673
env:
4774
PY_COLORS: 1
4875
ANSIBLE_FORCE_COLOR: 1
49-
NGINX_CRT: ${{ secrets.NGINX_CRT }}
50-
NGINX_KEY: ${{ secrets.NGINX_KEY }}
51-
RHEL_USERNAME: ${{ secrets.RHEL_USERNAME }}
52-
RHEL_PASSWORD: ${{ secrets.RHEL_PASSWORD }}
76+
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
collections:
33
- name: ansible.posix
4-
version: 1.4.0
5-
- name: community.crypto
6-
version: 2.10.0
4+
version: 1.5.4
75
- name: community.general
8-
version: 6.2.0
6+
version: 6.4.0
7+
- name: community.crypto
8+
version: 2.14.1
99
- name: community.docker # Only required if you plan to use Molecule
10-
version: 3.4.0
10+
version: 3.4.7
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ansible-core==2.16.2
2+
jinja2==3.1.3
3+
ansible-compat==4.1.11
4+
yamllint==1.33.0
5+
ansible-lint==6.22.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ansible-core==2.14.4
1+
ansible-core==2.16.2
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ansible-core==2.14.4
2-
Jinja2==3.1.2
3-
ansible-lint==6.15.0
4-
yamllint==1.30.0
5-
molecule[docker]==4.0.4
6-
docker==6.0.1
1+
ansible-core==2.16.2
2+
jinja2==3.1.3
3+
ansible-compat==4.1.11
4+
molecule==6.0.3
5+
molecule-plugins[docker]==23.5.0
6+
docker==7.0.0

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## 0.9.1 (Unreleased)
4+
5+
ENHANCEMENTS:
6+
7+
- Bump the Ansible `ansible.posix` collection to `1.5.4`, `community.general` collection to `6.4.0`, `community.crypto` collection to `2.14.1` and `community.docker` collection to `3.4.7`.
8+
- Oracle Linux 8 requires the Python `python3.11-cryptography` package for validating the NGINX App Protect repository certificate.
9+
10+
CI/CD:
11+
12+
- Split Ansible Lint into its own GitHub Actions job since Molecule no longer runs linters natively.
13+
- Replace `molecule[docker]` with `molecule` and `molecule-plugins[docker]`.
14+
- Add pre-releases to Release Drafter.
15+
316
## 0.9.0 (January 29, 2023)
417

518
FEATURES:

molecule/advanced/molecule.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ dependency:
55
role-file: molecule/advanced/requirements.yml
66
driver:
77
name: docker
8-
lint: |
9-
set -e
10-
ansible-lint --force-color
118
platforms:
129
- name: test-workload
1310
image: nginxdemos/hello

0 commit comments

Comments
 (0)