Skip to content
This repository was archived by the owner on Mar 9, 2024. It is now read-only.

Commit 0bd64c7

Browse files
authored
Synchronize files from cloudalchemy/skeleton (#3)
Synchronize files from cloudalchemy/skeleton
2 parents e8d3010 + 6addc37 commit 0bd64c7

File tree

5 files changed

+37
-17
lines changed

5 files changed

+37
-17
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
---
2+
dist: xenial
23
sudo: required
34
language: python
4-
python: 2.7
5+
python:
6+
- 3.5
57
cache: pip
68
services:
79
- docker
@@ -12,7 +14,7 @@ env:
1214
matrix:
1315
fast_finish: true
1416
install:
15-
- pip install tox-travis git-semver
17+
- pip3 install tox-travis git-semver
1618
script:
1719
- tox
1820
deploy:

CONTRIBUTING.md

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Contributor Guideline
22

3-
This document provides an overview of how you can participate in improving this project or extending it. We are grateful for all your help: bug reports and fixes, code contributions, documentation or ideas. Feel free to join, we appreciate your support!!
3+
This document provides an overview of how you can participate in improving this project or extending it. We are
4+
grateful for all your help: bug reports and fixes, code contributions, documentation or ideas. Feel free to join, we
5+
appreciate your support!!
46

57
## Communication
68

@@ -10,7 +12,8 @@ You can talk with us on #cloudalchemy channel on freenode.
1012

1113
### GitHub repositories
1214

13-
Much of the issues, goals and ideas are tracked in the respective projects in GitHub. Please use this channel to report bugs.
15+
Much of the issues, goals and ideas are tracked in the respective projects in GitHub. Please use this channel to report
16+
bugs.
1417

1518
## git and GitHub
1619

@@ -26,47 +29,61 @@ To have your code merged, see the expectations listed below.
2629

2730
You can find a well-written guide [here](https://help.github.com/articles/fork-a-repo).
2831

29-
Please follow common commit best-practices. Be explicit, have a short summary, a well-written description and references. This is especially important for the merge-request.
32+
Please follow common commit best-practices. Be explicit, have a short summary, a well-written description and
33+
references. This is especially important for the merge-request.
3034

31-
Some great guidelines can be found [here](https://wiki.openstack.org/wiki/GitCommitMessages) and [here](http://robots.thoughtbot.com/5-useful-tips-for-a-better-commit-message).
35+
Some great guidelines can be found [here](https://wiki.openstack.org/wiki/GitCommitMessages) and
36+
[here](http://robots.thoughtbot.com/5-useful-tips-for-a-better-commit-message).
3237

3338
## Releases
3439

35-
We try to stick to semantic versioning and our releases are made by CI pipeline. It is done by assigning a keyword (in a way similar to travis [`[ci skip]`](https://docs.travis-ci.com/user/customizing-the-build#Skipping-a-build)) to a commit with merge request. Available keywords are (square brackets are important!):
40+
We try to stick to semantic versioning and our releases are automated. Release is created by assigning a keyword (in a
41+
way similar to travis [`[ci skip]`](https://docs.travis-ci.com/user/customizing-the-build#Skipping-a-build)) to a
42+
commit with merge request. Available keywords are (square brackets are important!):
3643

3744
* `[patch]`, `[fix]` - for PATCH version release
3845
* `[minor]`, `[feature]`, `[feat]` - for MINOR version release
3946
* `[major]`, `[breaking change]` - for MAJOR version release
4047

4148
## Changelog
4249

43-
Changelog is generateg automatically on every merged Pull Request and all information is taken from github issues, PRs and labels.
50+
Changelog is generateg automatically on every merged Pull Request and all information is taken from github issues, PRs
51+
and labels.
4452

4553
## Expectations
4654

4755
### Keep it simple
4856

49-
We try to provide production ready ansible roles which should be as much zero-conf as possible but this doesn't mean to overcomplicate things. Just follow [KISS](https://en.wikipedia.org/wiki/KISS_principle).
57+
We try to provide production ready ansible roles which should be as much zero-conf as possible but this doesn't mean to
58+
overcomplicate things. Just follow [KISS](https://en.wikipedia.org/wiki/KISS_principle).
5059

5160
### Be explicit
5261

5362
* Please avoid using nonsensical property and variable names.
5463
* Use self-describing attribute names for user configuration.
55-
* In case of failures, communicate what happened and why a failure occurs to the user. Make it easy to track the code or action that produced the error. Try to catch and handle errors if possible to provide improved failure messages.
64+
* In case of failures, communicate what happened and why a failure occurs to the user. Make it easy to track the code
65+
or action that produced the error. Try to catch and handle errors if possible to provide improved failure messages.
5666

5767

5868
### Add tests
5969

60-
Currently we are using two test scenarios located in [/molecule](molecule) directory. First ([default](molecule/default/molecule.yml)) one is testing default configuration without any additional variables, second one ([alternative](molecule/alternative/molecule.yml)) is testing what happens when many variables from [/defaults/main.yml](defaults/main.yml) are changed. When adding new functionalities please add tests to proper scenarios. Tests are written in testinfra framework and are located in `/tests` subdirectory of scenario directory (for example default tests are in [/molecule/default/tests](molecule/default/tests)).
70+
We are striving to use at least two test scenarios located in [/molecule](molecule) directory. First one
71+
([default](molecule/default)) is testing default configuration without any additional variables, second one
72+
([alternative](molecule/alternative)) is testing what happens when many variables from
73+
[/defaults/main.yml](defaults/main.yml) are changed. When adding new functionalities please add tests to proper
74+
scenarios. Tests are written in testinfra framework and are located in `/tests` subdirectory of scenario directory
75+
(for example default tests are in [/molecule/default/tests](molecule/default/tests)).
6176
More information about:
6277
- [testinfra](http://testinfra.readthedocs.io/en/latest/index.html)
6378
- [molecule](https://molecule.readthedocs.io/en/latest/index.html)
6479

6580
### Follow best practices
6681

67-
Please follow [ansible best practices](http://docs.ansible.com/ansible/latest/playbooks_best_practices.html) and especially provide meaningful names to tasks and even comments where needed.
82+
Please follow [ansible best practices](http://docs.ansible.com/ansible/latest/playbooks_best_practices.html) and
83+
especially provide meaningful names to tasks and even comments where needed.
6884

69-
Our test framework automatically lints code with [`yamllint`](https://yamllint.readthedocs.io) and [`ansible-lint`](https://github.com/willthames/ansible-lint) programs so be sure to follow their rules.
85+
Our test framework automatically lints code with [`yamllint`](https://yamllint.readthedocs.io) and
86+
[`ansible-lint`](https://github.com/willthames/ansible-lint) programs so be sure to follow their rules.
7087

7188
Remember: Code is generally read much more often than written.
7289

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ tox
4949
```
5050
To run a custom molecule command on custom environment with only default test scenario:
5151
```sh
52-
tox -e py27-ansible28 -- molecule test -s default
52+
tox -e py35-ansible28 -- molecule test -s default
5353
```
5454
For more information about molecule go to their [docs](http://molecule.readthedocs.io/en/latest/).
5555

meta/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
galaxy_info:
33
author: Pawel Krupa
44
description: Deploy process_exporter
5+
role_name: process_exporter
56
license: MIT
7+
company: none
68
min_ansible_version: 2.6
7-
role_name: process_exporter
89
platforms:
910
- name: Ubuntu
1011
versions:
@@ -19,7 +20,7 @@ galaxy_info:
1920
- 7
2021
- name: Fedora
2122
versions:
22-
- 27
23+
- 30
2324
galaxy_tags:
2425
- monitoring
2526

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
minversion = 1.8
3-
envlist = py{27}-ansible{26,27,28}
3+
envlist = py{35}-ansible{26,27,28}
44
skipsdist = true
55

66
[travis:env]

0 commit comments

Comments
 (0)