Skip to content

Commit d172f61

Browse files
Merge pull request #23 from noelmcloughlin/template-formula
refactor(formula): align to template-formula & fix #19
2 parents aa5a945 + 2ab2b3e commit d172f61

File tree

106 files changed

+5072
-1504
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+5072
-1504
lines changed

.travis.yml

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
dist: bionic
5+
stages:
6+
- test
7+
- lint
8+
- name: release
9+
if: branch = master AND type != pull_request
10+
11+
sudo: required
12+
cache: bundler
13+
language: ruby
14+
15+
services:
16+
- docker
17+
18+
# Make sure the instances listed below match up with
19+
# the `platforms` defined in `kitchen.yml`
20+
# NOTE: Please try to select up to six instances that add some meaningful
21+
# testing of the formula's behaviour. If possible, try to refrain from
22+
# the classical "chosing all the instances because I want to test on
23+
# another/all distro/s" trap: it will just add time to the testing (see
24+
# the discussion on #121). As an example, the set chosen below covers
25+
# the most used distros families, systemd and non-systemd and the latest
26+
# three supported Saltstack versions with python2 and 3.
27+
# As for `kitchen.yml`, that should still contain all of the platforms,
28+
# to allow for comprehensive local testing
29+
# Ref: https://github.com/saltstack-formulas/template-formula/issues/118
30+
# Ref: https://github.com/saltstack-formulas/template-formula/issues/121
31+
env:
32+
matrix:
33+
- INSTANCE: debian-10-develop-py3
34+
# - INSTANCE: default-ubuntu-1804-develop-py3
35+
- INSTANCE: centos-7-develop-py3
36+
# INSTANCE: default-fedora-30-develop-py3
37+
# - INSTANCE: default-opensuse-leap-15-develop-py3
38+
# - INSTANCE: default-amazonlinux-2-develop-py2
39+
# - INSTANCE: default-arch-base-latest-develop-py2
40+
# - INSTANCE: default-debian-9-2019-2-py3
41+
- INSTANCE: ubuntu-1804-2019-2-py3
42+
- INSTANCE: centos-7-2019-2-py3
43+
# - INSTANCE: default-fedora-30-2019-2-py3
44+
- INSTANCE: opensuse-leap-15-2019-2-py3
45+
# INSTANCE: default-amazonlinux-2-2019-2-py2
46+
- INSTANCE: arch-base-latest-2019-2-py2
47+
# - INSTANCE: default-debian-9-2018-3-py2
48+
# - INSTANCE: default-ubuntu-1604-2018-3-py2
49+
# - INSTANCE: default-centos-7-2018-3-py2
50+
# INSTANCE: fedora-29-2018-3-py2
51+
# INSTANCE: default-opensuse-leap-15-2018-3-py2
52+
- INSTANCE: amazonlinux-2-2018-3-py2
53+
# - INSTANCE: default-arch-base-latest-2018-3-py2
54+
# - INSTANCE: default-debian-8-2017-7-py2
55+
# - INSTANCE: default-ubuntu-1604-2017-7-py2
56+
# INSTANCE: centos6-centos-6-2017-7-py2
57+
# - INSTANCE: default-fedora-29-2017-7-py2
58+
# - INSTANCE: default-opensuse-leap-15-2017-7-py2
59+
# - INSTANCE: default-amazonlinux-2-2017-7-py2
60+
# - INSTANCE: default-arch-base-latest-2017-7-py2
61+
62+
script:
63+
- bin/kitchen verify ${INSTANCE}
64+
65+
jobs:
66+
include:
67+
# Define the `lint` stage (runs `yamllint` and `commitlint`)
68+
- stage: lint
69+
language: node_js
70+
node_js: lts/*
71+
before_install: skip
72+
script:
73+
# Install and run `yamllint`
74+
# Need at least `v1.17.0` for the `yaml-files` setting
75+
- pip install --user yamllint>=1.17.0
76+
- yamllint -s .
77+
# Install and run `commitlint`
78+
- npm install @commitlint/config-conventional -D
79+
- npm install @commitlint/travis-cli -D
80+
- commitlint-travis
81+
# Define the release stage that runs `semantic-release`
82+
- stage: release
83+
language: node_js
84+
node_js: lts/*
85+
before_install: skip
86+
script:
87+
# Update `AUTHORS.md`
88+
- export MAINTAINER_TOKEN=${GH_TOKEN}
89+
- go get github.com/myii/maintainer
90+
- maintainer contributor
91+
92+
# Install all dependencies required for `semantic-release`
93+
- npm install @semantic-release/changelog@3 -D
94+
- npm install @semantic-release/exec@3 -D
95+
- npm install @semantic-release/git@7 -D
96+
deploy:
97+
provider: script
98+
skip_cleanup: true
99+
script:
100+
# Run `semantic-release`
101+
- npx semantic-release@15

.yamllint

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
# Extend the `default` configuration provided by `yamllint`
5+
extends: default
6+
7+
# Files to ignore completely
8+
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
9+
# 2. Any SLS files under directory `test/`, which are actually state files
10+
ignore: |
11+
node_modules/
12+
test/**/states/**/*.sls
13+
iscsi/oscodename.yaml
14+
15+
yaml-files:
16+
# Default settings
17+
- '*.yaml'
18+
- '*.yml'
19+
- .yamllint
20+
# SaltStack Formulas additional settings
21+
- '*.example'
22+
- '*.arch'
23+
- test/**/*.sls
24+
25+
rules:
26+
empty-values:
27+
forbid-in-block-mappings: true
28+
forbid-in-flow-mappings: true
29+
line-length:
30+
# Increase from default of `80`
31+
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
32+
max: 88

AUTHORS.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

FORMULA

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: iscsi
2+
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
3+
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
4+
version: 3.3.0
5+
release: 1
6+
minimum_version: 2017.7
7+
summary: iscsi formula
8+
description: Formula to use iscsi technologies
9+
top_level_dir: iscsi

Gemfile

Lines changed: 6 additions & 0 deletions
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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
Copyright 2015 TU Berlin and Fraunhofer FOKUS
1+
Copyright (c) 2014 Salt Stack Formulas
22

3-
Licensed under the Apache License, Version 2.0 (the "License");
4-
you may not use this file except in compliance with the License.
5-
You may obtain a copy of the License at
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
66

7-
http://www.apache.org/licenses/LICENSE-2.0
7+
http://www.apache.org/licenses/LICENSE-2.0
88

9-
Unless required by applicable law or agreed to in writing, software
10-
distributed under the License is distributed on an "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
See the License for the specific language governing permissions and
13-
limitations under the License.
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

0 commit comments

Comments
 (0)