Skip to content

Commit

Permalink
Add stable-2.12 to CI (#39)
Browse files Browse the repository at this point in the history
* Add stable-2.12 to CI

* Add ignore.txt

* Add ignore.txt

* Fix sanity
  • Loading branch information
Andersson007 authored Oct 7, 2021
1 parent b1a3d3d commit f676374
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 6 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ jobs:
matrix:
ansible:
- stable-2.10
- stable-2.11
- stable-2.12
- devel
runs-on: ubuntu-latest
steps:
Expand All @@ -18,10 +20,10 @@ jobs:
with:
path: ansible_collections/dellemc/os6

- name: Set up Python 3.6
- name: Set up Python 3.8
uses: actions/setup-python@v1
with:
python-version: 3.6
python-version: 3.8

- name: Install ansible-base (${{ matrix.ansible }})
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
Expand All @@ -30,4 +32,4 @@ jobs:
run: ansible-galaxy collection install ansible.netcommon -p ../../

- name: Run sanity tests
run: ansible-test sanity --docker -v --color --python 3.6
run: ansible-test sanity --docker -v --color --python 3.8
2 changes: 1 addition & 1 deletion plugins/cliconf/os6.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def get_device_info(self):
return device_info

@enable_mode
def get_config(self, source='running', format='text', flags=None):
def get_config(self, source='running', flags=None, format='text'):
if source not in ('running', 'startup'):
return self.invalid_params("fetching configuration from %s is not supported" % source)
# if source == 'running':
Expand Down
4 changes: 2 additions & 2 deletions plugins/module_utils/network/os6.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ def os6_parse(lines, indent=None, comment_tokens=None):

class NetworkConfig(NetworkConfig):

def load(self, contents):
self._items = os6_parse(contents, self._indent)
def load(self, s):
self._items = os6_parse(s, self._indent)

def _diff_line(self, other, path=None):
diff = list()
Expand Down
4 changes: 4 additions & 0 deletions tests/sanity/ignore-2.12.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
plugins/action/os6.py action-plugin-docs
plugins/modules/os6_config.py validate-modules:parameter-list-no-elements
plugins/modules/os6_facts.py validate-modules:parameter-list-no-elements
plugins/modules/os6_command.py validate-modules:parameter-list-no-elements
4 changes: 4 additions & 0 deletions tests/sanity/ignore-2.13.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
plugins/action/os6.py action-plugin-docs
plugins/modules/os6_config.py validate-modules:parameter-list-no-elements
plugins/modules/os6_facts.py validate-modules:parameter-list-no-elements
plugins/modules/os6_command.py validate-modules:parameter-list-no-elements

0 comments on commit f676374

Please sign in to comment.