Skip to content

Commit

Permalink
Added shippable as a part of CI/CD (#1762)
Browse files Browse the repository at this point in the history
* added helpful info

* added shippable

* updated gitignore
  • Loading branch information
wojtek0806 committed Jun 8, 2020
1 parent 2a1c994 commit e6f55d1
Show file tree
Hide file tree
Showing 24 changed files with 452 additions and 236 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -111,3 +111,5 @@ ansible_py3/
*f5devcentral*
# other collections
ansible
# ignore build artifacts
builds/*
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -21,7 +21,7 @@ jobs:
name: F5 Unit Tests
script:
- export PYTHONPATH=$PYTHONPATH:$TRAVIS_BUILD_DIR
- inv test.install-dep
- travis_retry inv test.install-dep
- travis_retry pip install pytest --upgrade
- pytest -x -s $TRAVIS_BUILD_DIR/ansible_collections/f5networks/f5_modules/tests/unit/modules/network/f5/
python: "3.6"
Expand Down
52 changes: 52 additions & 0 deletions ansible_collections/f5networks/f5_modules/README.md
@@ -0,0 +1,52 @@
# f5networks.f5_modules

This collection includes the most recently released ansible modules for BIG-IP and BIG-IQ from F5Networks. This collection packages and distributes playbooks, roles, modules, and plugins.

## Requirements

- ansible >= 2.9

## Installation

To install in ansible default or defined paths use:
```bash
ansible-galaxy collection install f5networks.f5_modules
```

To specify the installation location use `-p`. If specifying a folder, make sure to update the `ansible.cfg` so ansible will check this folder as well.
```bash
ansible-galaxy collection install f5networks.f5_modules -p collections/
```

To specify the version of the collection to install, include it at the end of the collection with `:==1.0.0`:
```bash
ansible-galaxy collection install f5networks.f5_modules:==1.0.0
```

Sematic Versioning examples below:
- Increment major (for example: x in x.y.z) version number for an incompatible API change.
- Increment minor (for example: y in x.y.z) version number for new functionality in a backwards compatible manner.
- Increment patch (for example: z in x.y.z) version number for backwards compatible bug fixes.

## Example Usage


To use a module from a collection, reference the full namespace, collection, and modules name that you want to use:

```
---
- name: Using Collections
hosts: f5
connection: local
tasks:
- f5networks.f5_modules.bigip_pool:
name: my-pool
....
```

## Author Information

F5 Networks
[F5 Networks](http://www.f5.com)
Empty file.
17 changes: 0 additions & 17 deletions ansible_collections/f5networks/f5_modules/plugins/filter/q.py

This file was deleted.

Expand Up @@ -84,7 +84,7 @@

from ..module_utils.bigip import F5RestClient
from ..module_utils.common import (
F5ModuleError, AnsibleF5Parameters, transform_name, f5_argument_spec, flatten_boolean
F5ModuleError, AnsibleF5Parameters, f5_argument_spec
)


Expand Down
Expand Up @@ -7219,11 +7219,11 @@

try:
from ansible_collections.ansible.netcommon.plugins.module_utils.compat.ipaddress import (
ip_network, ip_interface, ip_address
ip_interface
)
except ImportError:
from ansible.module_utils.compat.ipaddress import (
ip_network, ip_interface, ip_address
ip_interface
)

from collections import namedtuple
Expand Down Expand Up @@ -12614,9 +12614,9 @@ def address(self):

@property
def netmask(self):
result = None
parts = self._values['address'].split('/')
if is_valid_ip(parts[0]):
addr = ip_address(u'{0}'.format(parts[0]))
ip = ip_interface(u'{0}'.format(self._values['address']))
result = ip.netmask
return str(result)
Expand Down
Expand Up @@ -169,14 +169,6 @@
from ansible.module_utils.basic import env_fallback
from ansible.module_utils.six import iteritems

try:
from ansible_collections.ansible.netcommon.plugins.module_utils.compat.ipaddress import (
ip_network, ip_interface
)
except ImportError:
from ansible.module_utils.compat.ipaddress import (
ip_network, ip_interface
)

from ..module_utils.bigip import F5RestClient
from ..module_utils.common import (
Expand Down
Expand Up @@ -320,7 +320,7 @@

from ..module_utils.bigip import F5RestClient
from ..module_utils.common import (
F5ModuleError, AnsibleF5Parameters, transform_name, f5_argument_spec, flatten_boolean, fq_name
F5ModuleError, AnsibleF5Parameters, transform_name, f5_argument_spec, flatten_boolean
)
from ..module_utils.compare import cmp_str_with_none
from ..module_utils.ipaddress import is_valid_ip
Expand Down
Expand Up @@ -58,5 +58,5 @@ def on_open_shell(self):
try:
self._exec_cli_command(b'tmsh modify cli preference display-threshold 0 pager disabled')
self._exec_cli_command(b'stty cols 1000000 2> /dev/null')
except AnsibleConnectionFailure as ex:
except AnsibleConnectionFailure:
raise AnsibleConnectionFailure('unable to set terminal parameters')
@@ -1,3 +1,6 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

from ansible_collections.f5networks.f5_modules.tests.unit.compat.mock import MagicMock
from ansible.utils.path import unfrackpath

Expand Down
@@ -1,3 +1,6 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

import io
import yaml

Expand Down
@@ -1,5 +1,7 @@
# Copyright (c) 2017 Ansible Project
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

import json

Expand Down

This file was deleted.

@@ -1,3 +1,6 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

import json

from ..compat import unittest
Expand Down

0 comments on commit e6f55d1

Please sign in to comment.