-
Notifications
You must be signed in to change notification settings - Fork 88
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
Update testing environment, attempt to use new formula format #44
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
3fa2a58
ci(kitchen+travis): update testing environment
javierbertoli 0ff48e1
fix(map.jinja+tests): add correct keyring for the OS
javierbertoli 56ec15d
chore: follow template-formula guidelines
javierbertoli e1c68e8
chore(kitchen): add bin/kitchen
javierbertoli 530e22c
docs(kitchen): update documentation
javierbertoli 1496eed
refactor: Merge branch 'upstream/master'
javierbertoli eda8517
fix(map.jinja): typo and lookup order
javierbertoli File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,113 @@ | ||
*.swp | ||
# Byte-compiled / optimized / DLL files | ||
__pycache__/ | ||
*.py[cod] | ||
*$py.class | ||
|
||
# C extensions | ||
*.so | ||
|
||
# Distribution / packaging | ||
.Python | ||
env/ | ||
build/ | ||
develop-eggs/ | ||
dist/ | ||
downloads/ | ||
eggs/ | ||
.eggs/ | ||
lib/ | ||
lib64/ | ||
parts/ | ||
sdist/ | ||
var/ | ||
wheels/ | ||
*.egg-info/ | ||
.installed.cfg | ||
*.egg | ||
|
||
# PyInstaller | ||
# Usually these files are written by a python script from a packager | ||
# before PyInstaller builds the exe, so as to inject date/other infos into it. | ||
*.manifest | ||
*.spec | ||
|
||
# Installer logs | ||
pip-log.txt | ||
pip-delete-this-directory.txt | ||
|
||
# Unit test / coverage reports | ||
htmlcov/ | ||
.tox/ | ||
.coverage | ||
.coverage.* | ||
.cache | ||
nosetests.xml | ||
coverage.xml | ||
*.cover | ||
.hypothesis/ | ||
.kitchen | ||
.kitchen.local.yml | ||
kitchen.local.yml | ||
|
||
# Translations | ||
*.mo | ||
*.pot | ||
|
||
# Django stuff: | ||
*.log | ||
local_settings.py | ||
|
||
# Flask stuff: | ||
instance/ | ||
.webassets-cache | ||
|
||
# Scrapy stuff: | ||
.scrapy | ||
|
||
# Sphinx documentation | ||
docs/_build/ | ||
|
||
# PyBuilder | ||
target/ | ||
|
||
# Jupyter Notebook | ||
.ipynb_checkpoints | ||
|
||
# pyenv | ||
.python-version | ||
|
||
# celery beat schedule file | ||
celerybeat-schedule | ||
|
||
# SageMath parsed files | ||
*.sage.py | ||
|
||
# dotenv | ||
.env | ||
|
||
# virtualenv | ||
.venv | ||
venv/ | ||
ENV/ | ||
|
||
# Spyder project settings | ||
.spyderproject | ||
.spyproject | ||
|
||
# Rope project settings | ||
.ropeproject | ||
|
||
# mkdocs documentation | ||
/site | ||
|
||
# mypy | ||
.mypy_cache/ | ||
|
||
# Bundler | ||
Gemfile.lock | ||
|
||
# copied `.md` files used for conversion to `.rst` using `m2r` | ||
docs/*.md | ||
|
||
# Vim | ||
*.sw? |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
stages: | ||
- test | ||
- commitlint | ||
- name: release | ||
if: branch = master AND type != pull_request | ||
|
||
sudo: required | ||
cache: bundler | ||
language: ruby | ||
|
||
services: | ||
- docker | ||
|
||
# Make sure the instances listed below match up with | ||
# the `platforms` defined in `kitchen.yml` | ||
# NOTE: Please try to select up to six instances that add some meaningful | ||
# testing of the formula's behaviour. If possible, try to refrain from | ||
# the classical "chosing all the instances because I want to test on | ||
# another/all distro/s" trap: it will just add time to the testing (see | ||
# the discussion on #121). As an example, the set chosen below covers | ||
# the most used distros families, systemd and non-systemd and the latest | ||
# three supported Saltstack versions with python2 and 3." | ||
# As for `kitchen.yml`, that should still contain all of the platforms, | ||
# to allow for comprehensive local testing | ||
# Ref: https://github.com/saltstack-formulas/template-formula/issues/118 | ||
# Ref: https://github.com/saltstack-formulas/template-formula/issues/121 | ||
env: | ||
matrix: | ||
- INSTANCE: repositories-debian-9-2019-2-py3 | ||
- INSTANCE: repositories-ubuntu-1804-2019-2-py3 | ||
- INSTANCE: preferences-debian-9-2019-2-py3 | ||
- INSTANCE: preferences-ubuntu-1804-2019-2-py3 | ||
|
||
script: | ||
- bundle exec kitchen verify ${INSTANCE} | ||
|
||
jobs: | ||
include: | ||
# Define the commitlint stage | ||
- stage: commitlint | ||
language: node_js | ||
node_js: lts/* | ||
before_install: skip | ||
script: | ||
- npm install @commitlint/config-conventional -D | ||
- npm install @commitlint/travis-cli -D | ||
- commitlint-travis | ||
# Define the release stage that runs semantic-release | ||
- stage: release | ||
language: node_js | ||
node_js: lts/* | ||
before_install: skip | ||
script: | ||
# Update `AUTHORS.md` | ||
- export MAINTAINER_TOKEN=${GH_TOKEN} | ||
- go get github.com/myii/maintainer | ||
- maintainer contributor | ||
|
||
# Install all dependencies required for `semantic-release` | ||
- npm install @semantic-release/changelog@3 -D | ||
- npm install @semantic-release/exec@3 -D | ||
- npm install @semantic-release/git@7 -D | ||
deploy: | ||
provider: script | ||
skip_cleanup: true | ||
script: | ||
# Run `semantic-release` | ||
- npx semantic-release@15 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
name: apt | ||
os: Debian, Ubuntu, Raspbian | ||
os_family: Debian | ||
version: 0.2.0 | ||
release: 1 | ||
minimum_version: 2017.7 | ||
summary: Apt formula | ||
description: Formula to configure APT and related resources | ||
top_level_dir: apt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
source "https://rubygems.org" | ||
|
||
gem 'kitchen-docker', '>= 2.9' | ||
gem 'kitchen-salt', '>= 0.6.0' | ||
gem 'kitchen-inspec', '>= 1.1' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any plan for
debian-8
and/orubuntu-1604
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Didn't see a valid reason to add them, as the files managed in this formula have not changed in a noticeable way.