Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade formula to new standards #23

Merged
merged 15 commits into from
Sep 30, 2019
Merged

Upgrade formula to new standards #23

merged 15 commits into from
Sep 30, 2019

Conversation

n-rodriguez
Copy link
Member

No description provided.

@n-rodriguez n-rodriguez requested a review from myii September 12, 2019 20:00
@myii
Copy link
Member

myii commented Sep 13, 2019

Just a quick note for now: we've got the updated matrix running in Cirrus (see .cirrus.yml).

@n-rodriguez
Copy link
Member Author

Just a quick note for now: we've got the updated matrix running in Cirrus (see .cirrus.yml).

Do we need to keep cirrus on this formula?

@myii
Copy link
Member

myii commented Sep 24, 2019

Do we need to keep cirrus on this formula?

@n-rodriguez It's not absolutely necessary but I was hoping to keep at least some of the repos active on Cirrus, so that we can keep working towards long-term CI solutions (inc. sharing the load with Travis, working out if we can get FreeBSD and Windows working, etc.). There are only two repos using Cirrus at the moment: rkhunter and this one. All you have to do is move the changes you made in .travis.yml to .cirrus.yml -- and that's only the matrix. If you're really not happy, then we can move over to Travis instead.

@n-rodriguez
Copy link
Member Author

All you have to do is move the changes you made in .travis.yml to .cirrus.yml

done

If you're really not happy, then we can move over to Travis instead.

I'm fine with it 👍

@myii
Copy link
Member

myii commented Sep 25, 2019

@n-rodriguez OK, we should be able to get amazonlinux-2 working by enabling the EPEL repo. I'll add that commit here if it works at my end.

https://cirrus-ci.com/task/4842608959946752?command=verify#L353-L357:

              errors:
                  - Running scope as unit run-300.scope.
                    Loaded plugins: ovl, priorities
                    No package syslog-ng available.
                    Error: Nothing to do

@myii
Copy link
Member

myii commented Sep 25, 2019

@n-rodriguez Good news, with the changes I've tested, this is working across all 28 of our instances now (including arch-base-latest):

One nice thing about Cirrus is that it runs around 8 instances concurrently, so it can finish pretty fast at good times.

I'm going to clean up the commits and then add them here, for your perusal before merging.

@myii
Copy link
Member

myii commented Sep 25, 2019

@n-rodriguez So I've added 3 commits to this PR:

4e46ea0 -- feat(install): provide EPEL repo configuration for Amazon Linux-2

2112711 -- feat(platform): add support for Arch

373ff11 -- chore: use semantic-release cross-formula standard structure

  • This commit could be avoided entirely by:
    • Rebasing this PR on the latest upstream
    • Removing any changes made to .travis.yml (i.e. removing commits 2049866 and 2a94fab)

@myii
Copy link
Member

myii commented Sep 25, 2019

@n-rodriguez Right, since the lint stage hasn't run during the course of this PR, got some yamllint errors to fix.

https://travis-ci.com/saltstack-formulas/syslog-ng-formula/builds/129135816#L210-L217:

$ yamllint -s .
./test/salt/pillar/syslog_ng.sls
  4:24      warning  truthy value should be one of [false, true]  (truthy)
  6:16      warning  truthy value should be one of [false, true]  (truthy)
  7:17      warning  truthy value should be one of [false, true]  (truthy)
  16:7      error    wrong indentation: expected 8 but found 6  (indentation)
  20:7      error    wrong indentation: expected 8 but found 6  (indentation)
  25:7      error    wrong indentation: expected 8 but found 6  (indentation)

I'll just append another commit to fix that.

https://travis-ci.com/saltstack-formulas/syslog-ng-formula/builds/129135816#L210-L217:

```bash
$ yamllint -s .
./test/salt/pillar/syslog_ng.sls
  4:24      warning  truthy value should be one of [false, true]  (truthy)
  6:16      warning  truthy value should be one of [false, true]  (truthy)
  7:17      warning  truthy value should be one of [false, true]  (truthy)
  16:7      error    wrong indentation: expected 8 but found 6  (indentation)
  20:7      error    wrong indentation: expected 8 but found 6  (indentation)
  25:7      error    wrong indentation: expected 8 but found 6  (indentation)
```
@n-rodriguez
Copy link
Member Author

@myii do you think we can merge it?

@myii myii merged commit fa32601 into saltstack-formulas:master Sep 30, 2019
@myii
Copy link
Member

myii commented Sep 30, 2019

@n-rodriguez Sure, I just wanted you to review the commits I added. Merged.

@n-rodriguez
Copy link
Member Author

@n-rodriguez Sure, I just wanted you to review the commits I added. Merged.

Thank you!

@n-rodriguez n-rodriguez deleted the wip/kitchen branch September 30, 2019 14:03
@saltstack-formulas-travis

🎉 This PR is included in version 0.4.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants