Skip to content

Commit 98e105e

Browse files
Final tasks for inclusion of netbox.netbox in Ansible 2.10 (#303)
1 parent 65f1f38 commit 98e105e

File tree

9 files changed

+1147
-8
lines changed

9 files changed

+1147
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ __pycache__/
44
tests/output/*
55
venv/
66
.vscode/
7+
changelogs/.plugin-cache.yaml
78
docs/_build/*
89

910
# https://github.com/ansible/ansible/issues/68499

.travis.yml

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ dist: bionic
88

99
env:
1010
global:
11-
- COLLECTION_NAMESPACE: netbox
12-
- COLLECTION_NAME: netbox
13-
- COLLECTION_VERSION: 1.0.0
11+
- COLLECTION_NAMESPACE: "netbox"
12+
- COLLECTION_NAME: "netbox"
13+
- COLLECTION_VERSION: "1.0.0"
1414
- secure: "tE6GtwrRU+Kjobx/94xqR2MqM20pHCnrLcHgPzIHA3npdwuA+GjCBiBLTkEEQM4fUWIfzUTyjSr9bZErm1PTI1GcIRdniTgJ3ZzSSkE7tgeYALB/7xsusB57SlmbBQm2SGwU558uWZ3NHEsi0WTgD8GKZo77OpGX72FZKsVXOz6k2wve51sOtoSVjgCsvWTmZHx4ynGdiA5wFkZfaEcjXECahKtunW+MlB5kpJzkVeLRUEXFMhWlsIYiA5nj8OI/X3Nk9ugh1ribENX9LrjpgrqQ9YariZ8G6py1ONuKZIn2g7xs5kNQ3qL6HL6N7SoUxiwH16CfSyugFaYiMfaxQ4NUVGGRHS4vSGbNIf+gLHcYvP40miI1f/+pntCzqygZMhW73FX2o+KH2OGv09khOl8k1nDg2/XvW0kCc/FU6l+Jp5wCC8H9X2uiULtQpRqts5TzIonlPEzGIpfGFgJ5m54Emhv9gjG1Z5OOyL/qae1Wr+L/uhiFafcglZYh8NHEMWCUCkeqFqR2kDmUMtdgYLD7Q7NdwlL/PSVVs1l7UPiQHlnecQKEHN7CvR3eKByTEmkCKafRYh/JQ9rBt9sZc7aAPVu+w3wWUwbHS4o4vVnmyXvJb1PeJSiuynF7CBo4Qd6qj4YwX8gLK6PylGyaMOp169u6xw1mo5/CX0pJ3x4="
1515

1616
jobs:
@@ -28,8 +28,10 @@ jobs:
2828
- docker-compose pull
2929
- docker-compose up -d
3030
- cd ..
31+
- pip install -U pip
32+
- pip install -U pytest
3133
- pip install -U pip "setuptools>=46.1.3"
32-
- pip install pytest==4.6.5 pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0 "coverage<5"
34+
- pip install pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0 "coverage<5"
3335
- pip install pynetbox cryptography codecov jmespath jsondiff ansible
3436

3537
# Stick to python 3.7 instead of 3.8, as ansible-test sanity is not compatible with 3.7
@@ -47,8 +49,10 @@ jobs:
4749
- docker-compose pull
4850
- docker-compose up -d
4951
- cd ..
52+
- pip install -U pip
53+
- pip install -U pytest
5054
- pip install -U pip "setuptools>=46.1.3"
51-
- pip install pytest==4.6.5 pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0 "coverage<5"
55+
- pip install pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0 "coverage<5"
5256
- pip install pynetbox cryptography codecov jmespath jsondiff ansible
5357

5458
# Latest development versions of Netbox and Ansible, newest Python
@@ -65,13 +69,37 @@ jobs:
6569
- docker-compose pull
6670
- docker-compose up -d
6771
- cd ..
72+
- pip install -U pip
73+
- pip install -U pytest
6874
- pip install -U pip "setuptools>=46.1.3"
69-
- pip install pytest==4.6.5 pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0 "coverage<5"
75+
- pip install pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0 "coverage<5"
7076
- pip install pynetbox cryptography jmespath jsondiff
7177
- git clone https://github.com/ansible/ansible.git
7278
- cd ansible
7379
- source hacking/env-setup
7480
- cd ..
81+
82+
# Commenting out, but keeping for next PR to work on sanity issues
83+
#- name: "Ansible 2.10 Preparation"
84+
# python: 3.8
85+
# env: INTEGRATION_TESTS=latest
86+
# install:
87+
# - pip install -U pip "setuptools>=46.1.3"
88+
# - pip install pytest==4.6.5 pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0 "coverage<5"
89+
# - pip install pynetbox cryptography jmespath jsondiff ansible-base
90+
# before_script:
91+
# - ls
92+
# - cd ..
93+
# - mkdir -p ~/ansible_collections/$COLLECTION_NAMESPACE
94+
# - cp -R ansible_modules ~/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME
95+
# - cd ~/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME
96+
# - ansible-galaxy collection build .
97+
# - ansible-galaxy collection install $COLLECTION_NAMESPACE-$COLLECTION_NAME-$COLLECTION_VERSION.tar.gz -p /home/travis/.ansible/collections
98+
# Run all further tests from within the installed directory
99+
# Required to resolve imports of other collections
100+
#- cd /home/travis/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME
101+
#script:
102+
# - ansible-test sanity --docker -v --exclude tests/ --exclude docs/ --skip-test pep8
75103
allow_failures:
76104
# When testing against dev netbox and dev ansible, allow failures
77105
- env: PYTHON_VER=3.8 VERSION=snapshot INTEGRATION_TESTS=latest

CHANGELOG.rst

Lines changed: 337 additions & 0 deletions
Large diffs are not rendered by default.

changelogs/changelog.yaml

Lines changed: 377 additions & 0 deletions
Large diffs are not rendered by default.

changelogs/config.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
changelog_filename_template: ../CHANGELOG.rst
2+
changelog_filename_version_depth: 0
3+
changes_file: changelog.yaml
4+
changes_format: combined
5+
ignore_other_fragment_extensions: true
6+
keep_fragments: false
7+
mention_ancestor: true
8+
new_plugins_after_name: removed_features
9+
notesdir: fragments
10+
prelude_section_name: release_summary
11+
prelude_section_title: Release Summary
12+
sections:
13+
- - major_changes
14+
- Major Changes
15+
- - minor_changes
16+
- Minor Changes
17+
- - breaking_changes
18+
- Breaking Changes / Porting Guide
19+
- - deprecated_features
20+
- Deprecated Features
21+
- - removed_features
22+
- Removed Features (previously deprecated)
23+
- - security_fixes
24+
- Security Fixes
25+
- - bugfixes
26+
- Bugfixes
27+
- - known_issues
28+
- Known Issues
29+
title: Netbox.Netbox
30+
trivial_section_name: trivial
31+
use_fqcn: true

galaxy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ tags:
4747
# range specifiers can be set and are separated by ','
4848
dependencies:
4949
# Required for ipaddress python library
50-
ansible.netcommon: "*"
50+
ansible.netcommon: ">=1.0.0"
5151

5252
# Required for json_query used in lookup plugin integration tests
53-
community.general: "*"
53+
community.general: ">=1.0.0"
5454

5555
# The URL of the originating SCM repository
5656
repository: https://github.com/netbox-community/ansible_modules

meta/runtime.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
requires_ansible: ">=2.9.10"
3+
plugin_routing:
4+
modules:
5+
netbox_interface:
6+
redirect: netbox.netbox.plugins.modules.netbox_device_interface

0 commit comments

Comments
 (0)