Skip to content

Commit

Permalink
Merge pull request #131 from dj-wasabi/add-requirements-ci
Browse files Browse the repository at this point in the history
Removing requirements file and use it from dj-wasabi-release repo
  • Loading branch information
dj-wasabi authored Oct 16, 2020
2 parents 07a0358 + 04935c3 commit 7f00767
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 25 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/telegraf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ jobs:
image: geerlingguy/docker-debian9-ansible:latest
- container: debian8
image: geerlingguy/docker-debian8-ansible:latest
- container: opensuse-leap
image: wdijkerman/molecule-systemd-leap:new
command: /sbin/init

steps:
- name: Check out code
uses: actions/checkout@v1
Expand All @@ -57,12 +53,13 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r molecule/requirements.txt
curl -so requirements.txt 'https://raw.githubusercontent.com/dj-wasabi/dj-wasabi-release/main/requirements.txt'
pip install -r requirements.txt
- name: Run role tests
run: >-
MY_MOLECULE_CONTAINER=${{ matrix.molecule_distro.container }}
MY_MOLECULE_IMAGE=${{ matrix.molecule_distro.image }}
MY_MOLECULE_GROUP=${{ matrix.molecule_distro.group }}
MY_MOLECULE_DOCKER_COMMAND=${{ matrix.molecule_distro.command }}
molecule test
molecule test
11 changes: 11 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
repos:
# - repo: https://github.com/dj-wasabi/pre-commit-hooks
# rev: master
# hooks:
# - id: ansible-lint
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Version (Release date)
* tagdrop
* interval
* Updated documentation


0.0.2 (2015-09-20)

Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ Please note that this project is released with a Contributor Code of Conduct. By
2. Create a branch and apply your changes to this branch.

a. Make sure you have updated the documentation when adding new variables;

b. Don't forget to add/update tests so we can test the functionality during each Pull Request;

c. Make sure the tests will succeed.

3. Push the branch to your fork and submit a pull request.
Expand Down Expand Up @@ -85,4 +85,4 @@ Some web pages describing for virtual env:

[Molecule V2 with your own role](https://werner-dijkerman.nl/2017/09/05/using-molecule-v2-to-test-ansible-roles/)

**End note**: Have fun making changes. If a feature helps you, then others find it helpful too and I will happily have it merged.
**End note**: Have fun making changes. If a feature helps you, then others find it helpful too and I will happily have it merged.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,12 @@ An example might look like this:
- fstype = [ "ext4", "xfs" ]
- path = [ "/opt", "/home" ]

If you want to define processors you can simply use `telegraf_processors` variable.
If you want to define processors you can simply use `telegraf_processors` variable.
An example might look like this:
```
telegraf_processors:
telegraf_processors:
- processor: rename
- processor: rename.replace
- processor: rename.replace
config:
- tag = "level"
- dest = "LogLevel"
Expand Down
2 changes: 1 addition & 1 deletion files/telegraf.init
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,4 @@ case $1 in
echo "Usage: $0 {start|stop|restart|status|version}"
exit 2
;;
esac
esac
10 changes: 0 additions & 10 deletions molecule/requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion templates/telegraf-extra-plugin.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@
{{ item }}
{% endfor %}
{% endfor %}
{% endif %}
{% endif %}

0 comments on commit 7f00767

Please sign in to comment.