Browse Source

fix(yamllint): use separate suite for `ubuntu`

* Semi-automated using https://github.com/myii/ssf-formula/pull/18
* Close #174
tags/v1.1.0
Imran Iqbal 5 years ago
parent
commit
6cba4af4f7
No account linked to committer's email address
4 changed files with 45 additions and 17 deletions
  1. +5
    -5
      .travis.yml
  2. +27
    -3
      kitchen.yml
  3. +1
    -9
      test/salt/pillar/debian.sls
  4. +12
    -0
      test/salt/pillar/ubuntu.sls

+ 5
- 5
.travis.yml View File

env: env:
matrix: matrix:
- INSTANCE: debian-debian-9-develop-py3 - INSTANCE: debian-debian-9-develop-py3
# - INSTANCE: debian-ubuntu-1804-develop-py3
# - INSTANCE: ubuntu-ubuntu-1804-develop-py3
# - INSTANCE: redhat-centos-7-develop-py3 # - INSTANCE: redhat-centos-7-develop-py3
# - INSTANCE: redhat-fedora-29-develop-py3 # - INSTANCE: redhat-fedora-29-develop-py3
# - INSTANCE: suse-opensuse-leap-15-develop-py3 # - INSTANCE: suse-opensuse-leap-15-develop-py3
# - INSTANCE: debian-debian-9-2019-2-py3 # - INSTANCE: debian-debian-9-2019-2-py3
- INSTANCE: debian-ubuntu-1804-2019-2-py3
- INSTANCE: ubuntu-ubuntu-1804-2019-2-py3
- INSTANCE: redhat-centos-7-2019-2-py3 - INSTANCE: redhat-centos-7-2019-2-py3
# - INSTANCE: redhat-fedora-29-2019-2-py3 # - INSTANCE: redhat-fedora-29-2019-2-py3
# - INSTANCE: suse-opensuse-leap-15-2019-2-py3 # - INSTANCE: suse-opensuse-leap-15-2019-2-py3
# - INSTANCE: debian-debian-9-2018-3-py2 # - INSTANCE: debian-debian-9-2018-3-py2
# - INSTANCE: debian-ubuntu-1604-2018-3-py2
# - INSTANCE: ubuntu-ubuntu-1604-2018-3-py2
# - INSTANCE: redhat-centos-7-2018-3-py2 # - INSTANCE: redhat-centos-7-2018-3-py2
- INSTANCE: redhat-fedora-29-2018-3-py2 - INSTANCE: redhat-fedora-29-2018-3-py2
- INSTANCE: suse-opensuse-leap-42-2018-3-py2 - INSTANCE: suse-opensuse-leap-42-2018-3-py2
# - INSTANCE: debian-debian-8-2017-7-py2 # - INSTANCE: debian-debian-8-2017-7-py2
# - INSTANCE: debian-ubuntu-1604-2017-7-py2
# - INSTANCE: ubuntu-ubuntu-1604-2017-7-py2
- INSTANCE: redhat-centos-6-2017-7-py2 - INSTANCE: redhat-centos-6-2017-7-py2
# - INSTANCE: redhat-fedora-28-2017-7-py2 # - INSTANCE: redhat-fedora-28-2017-7-py2
# - INSTANCE: suse-opensuse-leap-42-2017-7-py2 # - INSTANCE: suse-opensuse-leap-42-2017-7-py2
# Install and run `yamllint` # Install and run `yamllint`
- pip install --user yamllint - pip install --user yamllint
# yamllint disable-line rule:line-length # yamllint disable-line rule:line-length
- yamllint -s . .yamllint pillar.example test/salt/pillar/debian.sls test/salt/pillar/redhat.sls test/salt/pillar/suse.sls
- yamllint -s . .yamllint pillar.example test/salt/pillar/debian.sls test/salt/pillar/ubuntu.sls test/salt/pillar/redhat.sls test/salt/pillar/suse.sls
# Install and run `commitlint` # Install and run `commitlint`
- npm install @commitlint/config-conventional -D - npm install @commitlint/config-conventional -D
- npm install @commitlint/travis-cli -D - npm install @commitlint/travis-cli -D

+ 27
- 3
kitchen.yml View File

- name: debian - name: debian
includes: includes:
- debian-9-develop-py3 - debian-9-develop-py3
- ubuntu-1804-develop-py3
- debian-9-2019-2-py3 - debian-9-2019-2-py3
- ubuntu-1804-2019-2-py3
- debian-9-2018-3-py2 - debian-9-2018-3-py2
- ubuntu-1604-2018-3-py2
- debian-8-2017-7-py2 - debian-8-2017-7-py2
provisioner:
state_top:
base:
'*':
- php.repo
- php.fpm.install
- php.fpm.config
- php.fpm.pools
- php.modules
- php.fpm.service
pillars:
top.sls:
base:
'*':
- php
pillars_from_files:
php.sls: test/salt/pillar/debian.sls
verifier:
inspec_tests:
- path: test/integration/default
- name: ubuntu
includes:
- ubuntu-1804-develop-py3
- ubuntu-1804-2019-2-py3
- ubuntu-1604-2018-3-py2
- ubuntu-1604-2017-7-py2 - ubuntu-1604-2017-7-py2
provisioner: provisioner:
state_top: state_top:
base: base:
'*': '*':
- php - php
- ubuntu
pillars_from_files: pillars_from_files:
php.sls: test/salt/pillar/debian.sls php.sls: test/salt/pillar/debian.sls
ubuntu.sls: test/salt/pillar/ubuntu.sls
verifier: verifier:
inspec_tests: inspec_tests:
- path: test/integration/default - path: test/integration/default

+ 1
- 9
test/salt/pillar/debian.sls View File

# vim: ft=yaml # vim: ft=yaml
--- ---
php: php:
{% if salt['grains.get']('os') == 'Ubuntu' %}
use_external_repo: true
repo:
humanname: php-sury ppa
name: "deb http://ppa.launchpad.net/ondrej/php/ubuntu {{ salt['grains.get']('oscodename') }} main"
file: /etc/apt/sources.list.d/php-sury.list
key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c
{% else %}
repo: repo:
humanname: php-sury repo humanname: php-sury repo
# yamllint disable-line rule:line-length
name: "deb https://packages.sury.org/php/ {{ salt['grains.get']('oscodename') }} main" name: "deb https://packages.sury.org/php/ {{ salt['grains.get']('oscodename') }} main"
file: /etc/apt/sources.list.d/php-sury.list file: /etc/apt/sources.list.d/php-sury.list
key_url: https://packages.sury.org/php/apt.gpg key_url: https://packages.sury.org/php/apt.gpg
{% endif %}


version: version:
- '5.6' - '5.6'

+ 12
- 0
test/salt/pillar/ubuntu.sls View File

# -*- coding: utf-8 -*-
# vim: ft=yaml
---
php:
use_external_repo: true
repo:
humanname: php-sury ppa
# yamllint disable-line rule:line-length
name: "deb http://ppa.launchpad.net/ondrej/php/ubuntu {{ salt['grains.get']('oscodename') }} main"
file: /etc/apt/sources.list.d/php-sury.list
# yamllint disable-line rule:line-length
key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c

Loading…
Cancel
Save