Fix logging, minor bugs & kitchen testing #102

alxwr · 2019-05-24T22:34:58Z

Based on Add kitchen and fix logging #98: (Thanks, @tigpas!)
- fix logging
- added kitchen testing
implemented testing based on template formula
several minor fixes of bugs found by CI
exclude Fedora 29 from CI (for now)

@n-rodriguez I plan to close #98 in favor of this PR.

alxwr · 2019-05-24T22:37:11Z

~~Oh, I missed #101. Will merge it and rebase against it.~~

alxwr · 2019-05-24T22:51:26Z

I'll fix the commit messages...

n-rodriguez

thank you!

n-rodriguez · 2019-05-25T13:18:22Z

kitchen.yml

+        '*':
+          - openvpn
+  pillars_from_files:
+    openvpn.sls: test/config/pillars.sls


See saltstack-formulas/apt-formula#44 (comment)

openvpn/map.jinja

pillar.example

test/integration/default/controls/services_spec.rb

test/integration/default/controls/config_spec.rb

test/integration/default/controls/services_spec.rb

myii

From a semantic-release perspective (if that's the plan), there are a few more necessary changes:

Needs a FORMULA file.
Needs the pre-commit_semantic-release.sh file.
Needs the docs/CONTRIBUTING.rst file (with the last two sections removed).
Needs the updates to the docs/README.rst file.

For these last two, it's easier to get this from one of the latest semantic-release conversions, that are shown on saltstack-formulas/template-formula#21. For example:

If semantic-release wasn't the plan, then please ignore this! This can be used for a separate PR instead.

myii · 2019-05-25T17:29:01Z

.gitignore

+.kitchen.local.yml
+.cache
+junit-*.xml
+__pycache__


Since this file is being touched, do you merging it with the one in template-formula? The only difference is junit-*.xml. Otherwise, the rest can be pulled in from there.

myii · 2019-05-25T17:42:17Z

By the way, thanks to you both @tigpas and @alxwr for this contribution!

alxwr · 2019-05-25T18:10:36Z

@myii @n-rodriguez Thanks for your reviews and hints. I'll update the PR as soon as I find some time to do so!

n-rodriguez · 2019-06-23T22:39:05Z

Hi there! Any news?

myii · 2019-06-28T05:49:36Z

@alxwr When you get around to modifying this, could you please update kitchen+travis to use the new develop images, in the same way as the template-formula? Thanks.

Fedora 29 currently fails with "Cipher 'AES-256-GCM' mode not supported" But the cipher is hardcoded in the systemd unit. This is a bug within the distribution itself. => wont fix it in the formula (for now).

* Use `debian-9-develop-py3` * Remove `opensuse-leap-15-2019-2-py3`: - Ongoing errors with `opensuse-leap-15-*` - `bundler: failed to load command: kitchen ...` - Use `opensuse-leap-42-2018-3-py2` instead * Shift to `ubuntu-1804-2019-2-py3` to keep balanced ratio

alxwr · 2019-07-13T17:33:39Z

@n-rodriguez Hello there! The past weeks were challenging. I hope my fixes match your remarks. :-) Please review!

@myii Yes, I want to implement semantic versioning. Please review those changes!

Thanks to both of you for your patience!

test/integration/default/controls/services_spec.rb

n-rodriguez · 2019-07-13T19:02:05Z

@alxwr great work 👍

alxwr · 2019-07-13T20:25:13Z

@n-rodriguez Great review! :-)

myii · 2019-07-16T14:42:56Z

@alxwr Is this PR ready to be merged? Everything is in place from a semantic-release perspective. There are a few minor points but they can be covered in a future PR; I don't want to hold this up for any longer. Actually, one thing that is important to provide at this stage is bin/kitchen, since it's mentioned in the README.

alxwr · 2019-07-16T21:46:26Z

@myii: If you tell me how to do it, I'll add the missing parts.
The PR is ready from my perspective, I'm just waiting for @n-rodriguez' OK. :-)

myii · 2019-07-16T22:25:56Z

@alxwr To be honest, I'm working on a method of standardising all of the approximately 30 semantic-release formulas. It will be a semi-automatic process, which will save the time of having to conduct lengthy reviews! If you can add bin/kitchen to this PR, that would be great.

myii · 2019-07-16T22:29:16Z

@n-rodriguez We need #102 (comment) in the template-formula as well... would you care to fix it or shall I add it to the never-ending SaltStack Formulas list?!

alxwr · 2019-07-16T22:43:19Z

@myii That's great news! Thanks! Added bin/kitchen.

myii · 2019-07-17T04:59:06Z

@alxwr Happens to us all! The last commit got caught out by commitlint:

⧗   input: Added bin/kitchen
✖   subject may not be empty [subject-empty]
✖   type may not be empty [type-empty]

alxwr · 2019-07-17T10:22:22Z

@myii I should know better by now... Fixed the commit.

myii · 2019-07-18T22:23:37Z

@alxwr Shall we go ahead and merge? You made the fix that @n-rodriguez requested.

alxwr · 2019-07-19T00:10:59Z

@myii That's ok for me. :-)

myii · 2019-07-19T03:39:36Z

Merged. Thanks @alxwr and @n-rodriguez.

saltstack-formulas-travis · 2019-07-19T03:47:39Z

🎉 This PR is included in version 0.13.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

alxwr requested a review from n-rodriguez May 24, 2019 22:34

alxwr self-assigned this May 24, 2019

alxwr mentioned this pull request May 24, 2019

Add kitchen and fix logging #98

Closed

alxwr force-pushed the tigpas-add-kitchen-fix-log branch from 178117f to 499444a Compare May 24, 2019 22:56

n-rodriguez suggested changes May 25, 2019

View reviewed changes

n-rodriguez requested a review from myii May 25, 2019 13:26

myii mentioned this pull request May 25, 2019

Establish template-formula as the go-to resource for all formula development saltstack-formulas/template-formula#21

Open

71 tasks

myii suggested changes May 25, 2019

View reviewed changes

Pascal Liehne and others added 16 commits July 13, 2019 18:01

fix(logging): set replace=False and add dependencies for log files

9b71fcf

ci(kitchen): add kitchen file + testinfra

9c5ee26

ci(kitchen): test/config/pillars: add jinja for user on debian >= 9

3c7f947

ci(kitchen): rename pillar

4122fc0

chore(docs): moved README.rst into docs/

b412a60

ci(travis): test based on template-formula and saltstack-formulas#98

b9daf9b

fix(centos): install OpenSSL on CentOS

7e4c8d6

fix(service): use OS-specific service name in multi-service setups

b16756c

fix(centos-6): has only _one_ service 'openvpn'

3d5723d

fix(debian-ish): root owns the logs

3276d3b

fix(fedora): honor working directory & service name

4f8e899

ci(travis): exclude Fedora 29 from Travis CI

4a1f9ed

Fedora 29 currently fails with "Cipher 'AES-256-GCM' mode not supported" But the cipher is hardcoded in the systemd unit. This is a bug within the distribution itself. => wont fix it in the formula (for now).

fix(jinja): don't call pillar.get

33b98f5

ci(test data): moved Pillar test data

2fff1ee

fix(macros): use openvpn/macros.jinja

637387e

alxwr force-pushed the tigpas-add-kitchen-fix-log branch from b678ce2 to dd327aa Compare July 13, 2019 17:31

alxwr added 3 commits July 13, 2019 20:11

ci(cleanup): dropped obsolete opensuse-leap-15 workaround

1e1719d

ci(specs): increased readability

b2c9cf1

chore(semantic-release): take last steps towards semantic release

9044a92

alxwr force-pushed the tigpas-add-kitchen-fix-log branch from dd327aa to 9044a92 Compare July 13, 2019 18:12

n-rodriguez suggested changes Jul 13, 2019

View reviewed changes

test/integration/default/controls/services_spec.rb Outdated Show resolved Hide resolved

fix(specs): use boolean operator

89fa956

ci(testing): added bin/kitchen

15bea7b

alxwr force-pushed the tigpas-add-kitchen-fix-log branch from 9931f60 to 15bea7b Compare July 17, 2019 10:21

myii merged commit 820c15d into saltstack-formulas:master Jul 19, 2019

saltstack-formulas-travis added the released label Jul 19, 2019

alxwr deleted the tigpas-add-kitchen-fix-log branch July 19, 2019 07:16

alxwr mentioned this pull request Aug 5, 2019

fix(config): Debian/Ubuntu distinguishes between service and client #110

Merged

Fix logging, minor bugs & kitchen testing #102

Fix logging, minor bugs & kitchen testing #102

Uh oh!

Conversation

alxwr commented May 24, 2019

Uh oh!

alxwr commented May 24, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alxwr commented May 24, 2019

Uh oh!

n-rodriguez left a comment

Choose a reason for hiding this comment

Uh oh!

n-rodriguez May 25, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

myii left a comment

Choose a reason for hiding this comment

Uh oh!

myii May 25, 2019

Choose a reason for hiding this comment

Uh oh!

myii commented May 25, 2019

Uh oh!

alxwr commented May 25, 2019

Uh oh!

n-rodriguez commented Jun 23, 2019

Uh oh!

myii commented Jun 28, 2019

Uh oh!

alxwr commented Jul 13, 2019

Uh oh!

Uh oh!

n-rodriguez commented Jul 13, 2019

Uh oh!

alxwr commented Jul 13, 2019

Uh oh!

myii commented Jul 16, 2019

Uh oh!

alxwr commented Jul 16, 2019

Uh oh!

myii commented Jul 16, 2019

Uh oh!

myii commented Jul 16, 2019

Uh oh!

alxwr commented Jul 16, 2019

Uh oh!

myii commented Jul 17, 2019

Uh oh!

alxwr commented Jul 17, 2019

Uh oh!

myii commented Jul 18, 2019

Uh oh!

alxwr commented Jul 19, 2019

Uh oh!

myii commented Jul 19, 2019

Uh oh!

saltstack-formulas-travis commented Jul 19, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

alxwr commented May 24, 2019 •

edited

Loading