Skip to content

Commit 1018b2a

Browse files
authored
Merge branch 'main' into fix_985_986
2 parents 83657c8 + 0d22748 commit 1018b2a

File tree

45 files changed

+765
-229
lines changed

Some content is hidden

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

45 files changed

+765
-229
lines changed

.github/workflows/check_label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "Check label"
2+
name: "Check PR label 👓"
33
concurrency:
44
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
55
cancel-in-progress: true

.github/workflows/codecoverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "Code coverage"
2+
name: "Code Coverage 🎯"
33

44
on: # yamllint disable-line rule:truthy
55
push:
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
---
2+
name: Integration tests 💻
3+
on:
4+
pull_request_target:
5+
branches: [main]
6+
types:
7+
- labeled
8+
- opened
9+
- reopened
10+
- synchronize
11+
paths:
12+
- "plugins/**"
13+
- "tests/integration/**"
14+
workflow_dispatch:
15+
jobs:
16+
lab-create:
17+
uses: ansible/ansible-content-actions/.github/workflows/cml_lab_create.yaml@main
18+
with:
19+
topology_path: tests/integration/labs/multi.yaml
20+
# lab_title_override: "Optional custom lab title"
21+
secrets:
22+
virl_host: ${{ secrets.VIRL_HOST }}
23+
virl_username: ${{ secrets.VIRL_USERNAME }}
24+
virl_password: ${{ secrets.VIRL_PASSWORD }}
25+
26+
integration-tests:
27+
needs: lab-create
28+
strategy:
29+
fail-fast: true
30+
matrix:
31+
ansible_version: ["stable-2.16", "stable-2.18", "stable-2.19", "milestone", "devel"]
32+
uses: ansible/ansible-content-actions/.github/workflows/cml_network_integration.yaml@main
33+
with:
34+
ansible_version: ${{ matrix.ansible_version }}
35+
lab_nodes: ${{ needs.lab-create.outputs.lab_nodes_json }}
36+
37+
lab-destroy:
38+
if: ${{ always() }}
39+
needs: integration-tests
40+
uses: ansible/ansible-content-actions/.github/workflows/cml_lab_destroy.yaml@main
41+
secrets:
42+
virl_host: ${{ secrets.VIRL_HOST }}
43+
virl_username: ${{ secrets.VIRL_USERNAME }}
44+
virl_password: ${{ secrets.VIRL_PASSWORD }}

.github/workflows/integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Integration
1+
name: "Integration - old"
22
on:
33
pull_request_target:
44
branches: [main]

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "Release collection"
2+
name: "Release collection 🚀"
33
on: # yamllint disable-line rule:truthy
44
release:
55
types: [published]

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "CI"
2+
name: "Collection Tests 🧪"
33

44
concurrency:
55
group: ${{ github.head_ref || github.run_id }}

.pre-commit-config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ ci:
66
autofix_commit_msg: "chore: auto fixes from pre-commit.com hooks"
77

88
repos:
9+
# not a permanent fix, but to hardcode ansible-core 2.16 as repo dependecy
910
- repo: https://github.com/ansible-network/collection_prep
10-
rev: 1.1.2
11+
rev: da78082ea59b03ad16cd7dbee267f53e8ff50bb5
1112
hooks:
1213
- id: update-docs
1314

1415
- repo: https://github.com/pre-commit/pre-commit-hooks
15-
rev: v5.0.0
16+
rev: v6.0.0
1617
hooks:
1718
- id: check-merge-conflict
1819
- id: check-symlinks

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ The Ansible Cisco NX-OS collection includes a variety of Ansible content to help
66

77
The Cisco NX-OS connection plugins combined with Cisco NX-OS resource modules aligns the Cisco NX-OS experience with the other core networking platforms supported by Ansible.
88

9-
This collection has been tested against Cisco N9K-C9300v chassis running NX-OS 9.3.6.
10-
The modules with full support for Cisco MDS are tested against NX-OS 8.4(1) on MDS Switches.
9+
The modules with full support for Cisco MDS are tested against NX-OS 8.4(1) and 9.4(3a) on MDS Switches. The modules should work for all releases above 8.4(1)
1110

1211
## Support
1312

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
trivial:
3+
- Fix sanity issues and remove old python 2.x imports and dependencies.
4+
- Fix lint issues for lab files for CML based integration testing.
5+
- Update github workflow names for better clarity.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
doc_changes:
3+
- Update support statement for the collection in README.md for MDS switches.

0 commit comments

Comments
 (0)