Skip to content

Commit 13e4569

Browse files
myiimyii
authored
Merge pull request #44 from netmanagers/master
Update testing environment, attempt to use new formula format
2 parents a34d721 + eda8517 commit 13e4569

25 files changed

+898
-205
lines changed

‎.gitignore

+111-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,113 @@
1-
*.swp
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
env/
12+
build/
13+
develop-eggs/
14+
dist/
15+
downloads/
16+
eggs/
17+
.eggs/
18+
lib/
19+
lib64/
20+
parts/
21+
sdist/
22+
var/
23+
wheels/
24+
*.egg-info/
25+
.installed.cfg
26+
*.egg
27+
28+
# PyInstaller
29+
# Usually these files are written by a python script from a packager
30+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
31+
*.manifest
32+
*.spec
33+
34+
# Installer logs
35+
pip-log.txt
36+
pip-delete-this-directory.txt
37+
38+
# Unit test / coverage reports
39+
htmlcov/
40+
.tox/
41+
.coverage
42+
.coverage.*
43+
.cache
44+
nosetests.xml
45+
coverage.xml
46+
*.cover
47+
.hypothesis/
248
.kitchen
349
.kitchen.local.yml
50+
kitchen.local.yml
51+
52+
# Translations
53+
*.mo
54+
*.pot
55+
56+
# Django stuff:
57+
*.log
58+
local_settings.py
59+
60+
# Flask stuff:
61+
instance/
62+
.webassets-cache
63+
64+
# Scrapy stuff:
65+
.scrapy
66+
67+
# Sphinx documentation
68+
docs/_build/
69+
70+
# PyBuilder
71+
target/
72+
73+
# Jupyter Notebook
74+
.ipynb_checkpoints
75+
76+
# pyenv
77+
.python-version
78+
79+
# celery beat schedule file
80+
celerybeat-schedule
81+
82+
# SageMath parsed files
83+
*.sage.py
84+
85+
# dotenv
86+
.env
87+
88+
# virtualenv
89+
.venv
90+
venv/
91+
ENV/
92+
93+
# Spyder project settings
94+
.spyderproject
95+
.spyproject
96+
97+
# Rope project settings
98+
.ropeproject
99+
100+
# mkdocs documentation
101+
/site
102+
103+
# mypy
104+
.mypy_cache/
105+
106+
# Bundler
107+
Gemfile.lock
108+
109+
# copied `.md` files used for conversion to `.rst` using `m2r`
110+
docs/*.md
111+
112+
# Vim
113+
*.sw?

‎.kitchen.yml

-38
This file was deleted.

‎.travis.yml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
stages:
2+
- test
3+
- commitlint
4+
- name: release
5+
if: branch = master AND type != pull_request
6+
7+
sudo: required
8+
cache: bundler
9+
language: ruby
10+
11+
services:
12+
- docker
13+
14+
# Make sure the instances listed below match up with
15+
# the `platforms` defined in `kitchen.yml`
16+
# NOTE: Please try to select up to six instances that add some meaningful
17+
# testing of the formula's behaviour. If possible, try to refrain from
18+
# the classical "chosing all the instances because I want to test on
19+
# another/all distro/s" trap: it will just add time to the testing (see
20+
# the discussion on #121). As an example, the set chosen below covers
21+
# the most used distros families, systemd and non-systemd and the latest
22+
# three supported Saltstack versions with python2 and 3."
23+
# As for `kitchen.yml`, that should still contain all of the platforms,
24+
# to allow for comprehensive local testing
25+
# Ref: https://github.com/saltstack-formulas/template-formula/issues/118
26+
# Ref: https://github.com/saltstack-formulas/template-formula/issues/121
27+
env:
28+
matrix:
29+
- INSTANCE: repositories-debian-9-2019-2-py3
30+
- INSTANCE: repositories-ubuntu-1804-2019-2-py3
31+
- INSTANCE: preferences-debian-9-2019-2-py3
32+
- INSTANCE: preferences-ubuntu-1804-2019-2-py3
33+
34+
script:
35+
- bundle exec kitchen verify ${INSTANCE}
36+
37+
jobs:
38+
include:
39+
# Define the commitlint stage
40+
- stage: commitlint
41+
language: node_js
42+
node_js: lts/*
43+
before_install: skip
44+
script:
45+
- npm install @commitlint/config-conventional -D
46+
- npm install @commitlint/travis-cli -D
47+
- commitlint-travis
48+
# Define the release stage that runs semantic-release
49+
- stage: release
50+
language: node_js
51+
node_js: lts/*
52+
before_install: skip
53+
script:
54+
# Update `AUTHORS.md`
55+
- export MAINTAINER_TOKEN=${GH_TOKEN}
56+
- go get github.com/myii/maintainer
57+
- maintainer contributor
58+
59+
# Install all dependencies required for `semantic-release`
60+
- npm install @semantic-release/changelog@3 -D
61+
- npm install @semantic-release/exec@3 -D
62+
- npm install @semantic-release/git@7 -D
63+
deploy:
64+
provider: script
65+
skip_cleanup: true
66+
script:
67+
# Run `semantic-release`
68+
- npx semantic-release@15

‎FORMULA

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: apt
2+
os: Debian, Ubuntu, Raspbian
3+
os_family: Debian
4+
version: 0.2.0
5+
release: 1
6+
minimum_version: 2017.7
7+
summary: Apt formula
8+
description: Formula to configure APT and related resources
9+
top_level_dir: apt

‎Gemfile

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
source "https://rubygems.org"
2+
3+
gem 'kitchen-docker', '>= 2.9'
4+
gem 'kitchen-salt', '>= 0.6.0'
5+
gem 'kitchen-inspec', '>= 1.1'
6+

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2013-2015 Salt Stack Formulas
1+
Copyright (c) 2014 Salt Stack Formulas
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎README.rst

-68
This file was deleted.

0 commit comments

Comments
 (0)