Skip to content

Commit 1b9a770

Browse files
authored
Merge branch 'workflow-add-new-ansible' into add-openbao
2 parents 3465084 + b82f64d commit 1b9a770

File tree

2 files changed

+21
-23
lines changed

2 files changed

+21
-23
lines changed

.github/workflows/lint-collection.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ jobs:
66
lint:
77
uses: stackhpc/.github/.github/workflows/lint-collection.yml@main
88
with:
9-
lint_pip_dependencies: git+https://github.com/stackhpc/ansible-modules-hashivault@stackhpc
9+
lint_pip_dependencies: git+https://github.com/stackhpc/ansible-modules-hashivault@main

.github/workflows/pull_request.yml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,33 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ansible:
17-
- "2.9"
18-
- "2.10"
19-
- "2.12"
20-
type:
21-
- "vault"
22-
- "openbao"
16+
ansible_version:
17+
- "2.15"
18+
- "2.18"
19+
python_version:
20+
- "3.9"
21+
- "3.11"
22+
exclude:
23+
- python_version: "3.9"
24+
ansible_version: "2.18"
2325
steps:
24-
# Checks-out the repository under $GITHUB_WORKSPACE, so it's accessible to the job
25-
- uses: actions/checkout@v3
26+
- name: Github Checkout 🛎
27+
uses: actions/checkout@v4
2628

27-
- name: Install dependencies
29+
- name: Setup Python ${{ matrix.python_version }} 🐍
30+
uses: actions/setup-python@v5
31+
with:
32+
python-version: ${{ matrix.python_version }}
33+
34+
- name: Install dependencies 📦
2835
run: |
2936
pipx uninstall ansible-core
3037
python3 -m pip install --upgrade pip
31-
ansible_version=${{ matrix.ansible }}
32-
if [[ "${{ matrix.ansible }}" = "2.9" ]]; then
33-
ansible_package=ansible
34-
elif [[ "${{ matrix.ansible }}" = "2.10" ]]; then
35-
ansible_package=ansible
36-
ansible_version=3
37-
else
38-
ansible_package=ansible-core
39-
fi
40-
python3 -m pip install $ansible_package==$ansible_version.* docker git+https://github.com/stackhpc/ansible-modules-hashivault@stackhpc
38+
python3 -m pip install ansible-core==${{ matrix.ansible_version }}.* docker git+https://github.com/stackhpc/ansible-modules-hashivault@main
4139
ansible-galaxy collection build
4240
ansible-galaxy collection install *.tar.gz
41+
ansible-galaxy collection install community.general
4342
44-
# TODO: Use ansible-test to run these.
45-
- name: Running integration tests
43+
- name: Run integration tests 🧪
4644
run: |
4745
ansible-playbook -i tests/inventory -v tests/test_${{ matrix.type }}.yml -e ansible_python_interpreter=$(which python3)

0 commit comments

Comments
 (0)