Skip to content

Commit

Permalink
Merge pull request #30 from n-rodriguez/wip/ci
Browse files Browse the repository at this point in the history
Last updates from template-formula
  • Loading branch information
johnkeates authored May 14, 2019
2 parents 80273e8 + 615797e commit 399cf27
Show file tree
Hide file tree
Showing 5 changed files with 125 additions and 240 deletions.
109 changes: 109 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,110 @@
# 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
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@ stages:
if: branch = master AND type != pull_request

sudo: required
language: ruby
cache: bundler
language: ruby

services:
- docker


before_install:
- gem install bundler --no-document

env:
- PLATFORM=ubuntu
- PLATFORM=centos
Expand Down Expand Up @@ -54,4 +50,3 @@ jobs:
script:
# Run `semantic-release`
- npx semantic-release@15

7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
source "https://rubygems.org"

gem "test-kitchen"
gem "kitchen-docker"
gem "kitchen-salt"
gem 'kitchen-inspec'
gem 'kitchen-docker', '>= 2.9'
gem 'kitchen-salt', '>= 0.6.0'
gem 'kitchen-inspec', '>= 1.1'
230 changes: 0 additions & 230 deletions Gemfile.lock

This file was deleted.

12 changes: 12 additions & 0 deletions docs/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,18 @@ Vault `v0.10.0 <https://github.com/hashicorp/vault/blob/master/CHANGELOG.md#0100

The Salt execution modules are not compatible with this new backend, therefore if you intend to access Vault in dev mode using the Salt modules, it's suggested to use an outdated, but compatible version of Vault by setting a pillar value e.g. ``version: 0.9.6``.

Requirements
------------

* Ruby
* Docker

::

gem install bundler
bundle install
bundle exec kitchen test all

Testing
-------

Expand Down

0 comments on commit 399cf27

Please sign in to comment.