From 45f9a759618f6fe51d7c1cb24a4aba62fdb6d789 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 14 Jul 2019 23:57:23 +0100 Subject: [PATCH] chore: use `semantic-release` cross-formula standard structure * Automated using `ssf-formula` (v0.1.0-rc.1) --- .gitignore | 9 + .travis.yml | 61 ++-- Gemfile | 5 +- docs/CONTRIBUTING.rst | 1 + docs/TOFS_pattern.rst | 443 ---------------------------- kitchen.yml | 188 +++++++----- pre-commit_semantic-release.sh | 0 test/integration/default/README.md | 4 +- test/integration/default/inspec.yml | 8 +- 9 files changed, 153 insertions(+), 566 deletions(-) delete mode 100644 docs/TOFS_pattern.rst mode change 100644 => 100755 pre-commit_semantic-release.sh diff --git a/.gitignore b/.gitignore index ba07ed8..0bbb03c 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ coverage.xml .kitchen .kitchen.local.yml kitchen.local.yml +junit-*.xml # Translations *.mo @@ -111,3 +112,11 @@ docs/*.md # Vim *.sw? + +## Collected when centralising formulas (check and sort) +# `collectd-formula` +.pytest_cache/ +/.idea/ +Dockerfile.*_* +ignore/ +tmp/ diff --git a/.travis.yml b/.travis.yml index 476d64e..23ebb12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- stages: - test - commitlint @@ -7,52 +10,38 @@ stages: sudo: required cache: bundler language: ruby +dist: xenial 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: default-debian-9-develop-py3 - # - INSTANCE: default-ubuntu-1804-develop-py3 - # - INSTANCE: default-centos-7-develop-py3 - # - INSTANCE: default-fedora-29-develop-py3 - # - INSTANCE: default-opensuse-leap-15-develop-py3 - # - INSTANCE: default-debian-9-2019-2-py3 - - INSTANCE: default-ubuntu-1804-2019-2-py3 - - INSTANCE: default-centos-7-2019-2-py3 - # - INSTANCE: default-fedora-29-2019-2-py3 - # - INSTANCE: default-opensuse-leap-15-2019-2-py3 - # - INSTANCE: default-debian-9-2018-3-py2 - # - INSTANCE: default-ubuntu-1604-2018-3-py2 - # - INSTANCE: default-centos-7-2018-3-py2 - - INSTANCE: default-fedora-29-2018-3-py2 - # TODO: Use this when fixed instead of `opensuse-leap-42` - # Ref: https://github.com/netmanagers/salt-image-builder/issues/2 - # - INSTANCE: default-opensuse-leap-15-2018-3-py2 - - INSTANCE: default-opensuse-leap-42-2018-3-py2 - # - INSTANCE: default-debian-8-2017-7-py2 - # - INSTANCE: default-ubuntu-1604-2017-7-py2 - # TODO: Enable after improving the formula to work with other than `systemd` - - INSTANCE: default-centos-6-2017-7-py2 - # - INSTANCE: default-fedora-28-2017-7-py2 - # - INSTANCE: default-opensuse-leap-42-2017-7-py2 + - INSTANCE: debian-debian-9-develop-py3 + # - INSTANCE: debian-ubuntu-1804-develop-py3 + # - INSTANCE: redhat-centos-7-develop-py3 + # - INSTANCE: redhat-fedora-29-develop-py3 + # - INSTANCE: suse-opensuse-leap-15-develop-py3 + # - INSTANCE: debian-debian-9-2019-2-py3 + - INSTANCE: debian-ubuntu-1804-2019-2-py3 + - INSTANCE: redhat-centos-7-2019-2-py3 + # - INSTANCE: redhat-fedora-29-2019-2-py3 + # - INSTANCE: suse-opensuse-leap-15-2019-2-py3 + # - INSTANCE: debian-debian-9-2018-3-py2 + # - INSTANCE: debian-ubuntu-1604-2018-3-py2 + # - INSTANCE: redhat-centos-7-2018-3-py2 + - INSTANCE: redhat-fedora-29-2018-3-py2 + - INSTANCE: suse-opensuse-leap-42-2018-3-py2 + # - INSTANCE: debian-debian-8-2017-7-py2 + # - INSTANCE: debian-ubuntu-1604-2017-7-py2 + - INSTANCE: redhat-centos-6-2017-7-py2 + # - INSTANCE: redhat-fedora-28-2017-7-py2 + # - INSTANCE: suse-opensuse-leap-42-2017-7-py2 script: - - bundle exec kitchen verify ${INSTANCE} + - bin/kitchen verify ${INSTANCE} jobs: include: diff --git a/Gemfile b/Gemfile index 4a549a3..3b36de3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ -source 'https://rubygems.org' +source "https://rubygems.org" gem 'kitchen-docker', '>= 2.9' -gem 'kitchen-salt', '>= 0.6.0' +gem 'kitchen-salt', '>= 0.6.0' gem 'kitchen-inspec', '>= 1.1' + diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst index 5da9ae8..b7da8f4 100644 --- a/docs/CONTRIBUTING.rst +++ b/docs/CONTRIBUTING.rst @@ -156,3 +156,4 @@ An example of that: BREAKING CHANGE: With the removal of all of the `.sls` files under `template package`, this formula no longer supports the installation of packages. + diff --git a/docs/TOFS_pattern.rst b/docs/TOFS_pattern.rst deleted file mode 100644 index 13c01e9..0000000 --- a/docs/TOFS_pattern.rst +++ /dev/null @@ -1,443 +0,0 @@ -.. _tofs_pattern: - -TOFS: A pattern for using SaltStack -=================================== - -.. list-table:: - :name: tofs-authors - :header-rows: 1 - :stub-columns: 1 - :widths: 2,2,3,2 - - * - - - Person - - Contact - - Date - * - Authored by - - Roberto Moreda - - moreda@allenta.com - - 29/12/2014 - * - Modified by - - Daniel Dehennin - - daniel.dehennin@baby-gnu.org - - 07/02/2019 - * - Modified by - - Imran Iqbal - - https://github.com/myii - - 23/02/2019 - -All that follows is a proposal based on my experience with `SaltStack `_. The good thing of a piece of software like this is that you can "bend it" to suit your needs in many possible ways, and this is one of them. All the recommendations and thoughts are given "as it is" with no warranty of any type. - -.. contents:: **Table of Contents** - -Usage of values in pillar vs templates in ``file_roots`` --------------------------------------------------------- - -Among other functions, the *master* (or *salt-master*) serves files to the *minions* (or *salt-minions*). The `file_roots `_ is the list of directories used in sequence to find a file when a minion requires it: the first match is served to the minion. Those files could be `state files `_ or configuration templates, among others. - -Using SaltStack is a simple and effective way to implement configuration management, but even in a `non-multitenant `_ scenario, it is not a good idea to generally access some data (e.g. the database password in our `Zabbix `_ server configuration file or the private key of our `Nginx `_ TLS certificate). - -To avoid this situation we can use the `pillar mechanism `_, which is designed to provide controlled access to data from the minions based on some selection rules. As pillar data could be easily integrated in the `Jinja `_ templates, it is a good mechanism to store values to be used in the final rendering of state files and templates. - -There are a variety of approaches on the usage of pillar and templates as seen in the `saltstack-formulas `_' repositories. `Some `_ `developments `_ stress the initial purpose of pillar data into a storage for most of the possible variables for a determined system configuration. This, in my opinion, is shifting too much load from the original template files approach. Adding up some `non-trivial Jinja `_ code as essential part of composing the state file definitely makes SaltStack state files (hence formulas) more difficult to read. The extreme of this approach is that we could end up with a new render mechanism, implemented in Jinja, storing everything needed in pillar data to compose configurations. Additionally, we are establishing a strong dependency with the Jinja renderer. - -In opposition to the *put the code in file_roots and the data in pillars* approach, there is the *pillar as a store for a set of key-values* approach. A full-blown configuration file abstracted in pillar and jinja is complicated to develop, understand and maintain. I think a better and simpler approach is to keep a configuration file templated using just a basic (non-extensive but extensible) set of pillar values. - -On the reusability of SaltStack state files -------------------------------------------- - -There is a brilliant initiative of the SaltStack community called `salt-formulas `_. Their goal is to provide state files, pillar examples and configuration templates ready to be used for provisioning. I am a contributor for two small ones: `zabbix-formula `_ and `varnish-formula `_. - -The `design guidelines `_ for formulas are clear in many aspects and it is a recommended reading for anyone willing to write state files, even non-formulaic ones. - -In the next section, I am going to describe my proposal to extend further the reusability of formulas, suggesting some patterns of usage. - -The Template Override and Files Switch (TOFS) pattern ------------------------------------------------------ - -I understand a formula as a **complete, independent set of SaltStack state and configuration template files sufficient to configure a system**. A system could be something as simple as an NTP server or some other much more complex service that requires many state and configuration template files. - -The customization of a formula should be done mainly by providing pillar data used later to render either the state or the configuration template files. - -Example: NTP before applying TOFS -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Let's work with the NTP example. A basic formula that follows the `design guidelines `_ has the following files and directories tree: - -.. code-block:: - - /srv/saltstack/salt-formulas/ntp-saltstack-formula/ - ntp/ - map.jinja - init.sls - conf.sls - files/ - default/ - etc/ - ntp.conf.jinja - -In order to use it, let's assume a `masterless configuration `_ and this relevant section of ``/etc/salt/minion``: - -.. code-block:: yaml - - pillar_roots: - base: - - /srv/saltstack/pillar - file_client: local - file_roots: - base: - - /srv/saltstack/salt - - /srv/saltstack/salt-formulas/ntp-saltstack-formula - -.. code-block:: jinja - - {#- /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/map.jinja #} - {%- set ntp = salt['grains.filter_by']({ - 'default': { - 'pkg': 'ntp', - 'service': 'ntp', - 'config': '/etc/ntp.conf', - }, - }, merge=salt['pillar.get']('ntp:lookup')) %} - -In ``init.sls`` we have the minimal states required to have NTP configured. In many cases ``init.sls`` is almost equivalent to an ``apt-get install`` or a ``yum install`` of the package. - -.. code-block:: sls - - ## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/init.sls - {%- from 'ntp/map.jinja' import ntp with context %} - - Install NTP: - pkg.installed: - - name: {{ ntp.pkg }} - - Enable and start NTP: - service.running: - - name: {{ ntp.service }} - - enabled: True - - require: - - pkg: Install NTP package - -In ``conf.sls`` we have the configuration states. In most cases, that is just managing configuration file templates and making them to be watched by the service. - -.. code-block:: sls - - ## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls - include: - - ntp - - {%- from 'ntp/map.jinja' import ntp with context %} - - Configure NTP: - file.managed: - - name: {{ ntp.config }} - - template: jinja - - source: salt://ntp/files/default/etc/ntp.conf.jinja - - watch_in: - - service: Enable and start NTP service - - require: - - pkg: Install NTP package - -Under ``files/default``, there is a structure that mimics the one in the minion in order to avoid clashes and confusion on where to put the needed templates. There you can find a mostly standard template for the configuration file. - -.. code-block:: jinja - - {#- /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/files/default/etc/ntp.conf.jinja #} - {#- Managed by saltstack #} - {#- Edit pillars or override this template in saltstack if you need customization #} - {%- set settings = salt['pillar.get']('ntp', {}) %} - {%- set default_servers = ['0.ubuntu.pool.ntp.org', - '1.ubuntu.pool.ntp.org', - '2.ubuntu.pool.ntp.org', - '3.ubuntu.pool.ntp.org'] %} - - driftfile /var/lib/ntp/ntp.drift - statistics loopstats peerstats clockstats - filegen loopstats file loopstats type day enable - filegen peerstats file peerstats type day enable - filegen clockstats file clockstats type day enable - - {%- for server in settings.get('servers', default_servers) %} - server {{ server }} - {%- endfor %} - - restrict -4 default kod notrap nomodify nopeer noquery - restrict -6 default kod notrap nomodify nopeer noquery - - restrict 127.0.0.1 - restrict ::1 - -With all this, it is easy to install and configure a simple NTP server by just running ``salt-call state.sls ntp.conf``: the package will be installed, the service will be running and the configuration should be correct for most of cases, even without pillar data. - -Alternatively, you can define a highstate in ``/srv/saltstack/salt/top.sls`` and run ``salt-call state.highstate``. - -.. code-block:: sls - - ## /srv/saltstack/salt/top.sls - base: - '*': - - ntp.conf - -**Customizing the formula just with pillar data**, we have the option to define the NTP servers. - -.. code-block:: sls - - ## /srv/saltstack/pillar/top.sls - base: - '*': - - ntp - -.. code-block:: sls - - ## /srv/saltstack/pillar/ntp.sls - ntp: - servers: - - 0.ch.pool.ntp.org - - 1.ch.pool.ntp.org - - 2.ch.pool.ntp.org - - 3.ch.pool.ntp.org - -Template Override -^^^^^^^^^^^^^^^^^ - -If the customization based on pillar data is not enough, we can override the template by creating a new one in ``/srv/saltstack/salt/ntp/files/default/etc/ntp.conf.jinja`` - -.. code-block:: jinja - - {#- /srv/saltstack/salt/ntp/files/default/etc/ntp.conf.jinja #} - {#- Managed by saltstack #} - {#- Edit pillars or override this template in saltstack if you need customization #} - - {#- Some bizarre configurations here #} - {#- ... #} - - {%- for server in settings.get('servers', default_servers) %} - server {{ server }} - {%- endfor %} - -This way we are locally **overriding the template files** offered by the formula in order to make a more complex adaptation. Of course, this could be applied as well to any of the files, including the state files. - -Files Switch -^^^^^^^^^^^^ - -To bring some order into the set of template files included in a formula, as we commented, we suggest having a similar structure to a normal final file system under ``files/default``. - -We can make different templates coexist for different minions, classified by any `grain `_ value, by simply creating new directories under ``files``. This mechanism is based on **using values of some grains as a switch for the directories under** ``files/``. - -If we decide that we want ``os_family`` as switch, then we could provide the formula template variants for both the ``RedHat`` and ``Debian`` families. - -.. code-block:: - - /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/files/ - default/ - etc/ - ntp.conf.jinja - RedHat/ - etc/ - ntp.conf.jinja - Debian/ - etc/ - ntp.conf.jinja - -To make this work we need a ``conf.sls`` state file that takes a list of possible files as the configuration template. - -.. code-block:: sls - - ## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls - include: - - ntp - - {%- from 'ntp/map.jinja' import ntp with context %} - - Configure NTP: - file.managed: - - name: {{ ntp.config }} - - template: jinja - - source: - - salt://ntp/files/{{ grains.get('os_family', 'default') }}/etc/ntp.conf.jinja - - salt://ntp/files/default/etc/ntp.conf.jinja - - watch_in: - - service: Enable and start NTP service - - require: - - pkg: Install NTP package - -If we want to cover the possibility of a special template for a minion identified by ``node01`` then we could have a specific template in ``/srv/saltstack/salt/ntp/files/node01/etc/ntp.conf.jinja``. - -.. code-block:: jinja - - {#- /srv/saltstack/salt/ntp/files/node01/etc/ntp.conf.jinja #} - {#- Managed by saltstack #} - {#- Edit pillars or override this template in saltstack if you need customization #} - - {#- Some crazy configurations here for node01 #} - {#- ... #} - -To make this work we could write a specially crafted ``conf.sls``. - -.. code-block:: sls - - ## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls - include: - - ntp - - {%- from 'ntp/map.jinja' import ntp with context %} - - Configure NTP: - file.managed: - - name: {{ ntp.config }} - - template: jinja - - source: - - salt://ntp/files/{{ grains.get('id') }}/etc/ntp.conf.jinja - - salt://ntp/files/{{ grains.get('os_family') }}/etc/ntp.conf.jinja - - salt://ntp/files/default/etc/ntp.conf.jinja - - watch_in: - - service: Enable and start NTP service - - require: - - pkg: Install NTP package - -Using the ``files_switch`` macro -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -We can simplify the ``conf.sls`` with the new ``files_switch`` macro to use in the ``source`` parameter for the ``file.managed`` state. - -.. code-block:: sls - - ## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls - include: - - ntp - - {%- set tplroot = tpldir.split('/')[0] %} - {%- from 'ntp/map.jinja' import ntp with context %} - {%- from 'ntp/libtofs.jinja' import files_switch %} - - Configure NTP: - file.managed: - - name: {{ ntp.config }} - - template: jinja - - source: {{ files_switch(['/etc/ntp.conf.jinja'], - lookup='Configure NTP' - ) - }} - - watch_in: - - service: Enable and start NTP service - - require: - - pkg: Install NTP package - - -* This uses ``config.get``, searching for ``ntp:tofs:source_files:Configure NTP`` to determine the list of template files to use. -* If this does not yield any results, the default of ``['/etc/ntp.conf.jinja']`` will be used. - -In ``libtofs.jinja``, we define this new macro ``files_switch``. - -.. literalinclude:: ../template/libtofs.jinja - :caption: /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/libtofs.jinja - :language: jinja - -How to customise the ``source`` further -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -The examples below are based on an ``Ubuntu`` minion called ``theminion`` being configured via. pillar. - -Using the default settings of the ``files_switch`` macro above, -the ``source`` will be: - -.. code-block:: sls - - - source: - - salt://ntp/files/theminion/etc/ntp.conf.jinja - - salt://ntp/files/Debian/etc/ntp.conf.jinja - - salt://ntp/files/default/etc/ntp.conf.jinja - -Customise ``files`` -~~~~~~~~~~~~~~~~~~~ - -The ``files`` portion can be customised: - -.. code-block:: sls - - ntp: - tofs: - dirs: - files: files_alt - -Resulting in: - -.. code-block:: sls - - - source: - - salt://ntp/files_alt/theminion/etc/ntp.conf.jinja - - salt://ntp/files_alt/Debian/etc/ntp.conf.jinja - - salt://ntp/files_alt/default/etc/ntp.conf.jinja - -Customise the use of grains -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Grains can be customised and even arbitrary paths can be supplied: - -.. code-block:: sls - - ntp: - tofs: - files_switch: - - any/path/can/be/used/here - - id - - os - - os_family - -Resulting in: - -.. code-block:: sls - - - source: - - salt://ntp/files/any/path/can/be/used/here/etc/ntp.conf.jinja - - salt://ntp/files/theminion/etc/ntp.conf.jinja - - salt://ntp/files/Ubuntu/etc/ntp.conf.jinja - - salt://ntp/files/Debian/etc/ntp.conf.jinja - - salt://ntp/files/default/etc/ntp.conf.jinja - -Customise the ``default`` path -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The ``default`` portion of the path can be customised: - -.. code-block:: sls - - ntp: - tofs: - dirs: - default: default_alt - -Resulting in: - -.. code-block:: sls - - - source: - ... - - salt://ntp/files/default_alt/etc/ntp.conf.jinja - -Customise the list of ``source_files`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The list of ``source_files`` can be given: - -.. code-block:: sls - - ntp: - tofs: - source_files: - Configure NTP: - - '/etc/ntp.conf.jinja' - - '/etc/ntp.conf_alt.jinja' - -Resulting in: - -.. code-block:: sls - - - source: - - salt://ntp/files/theminion/etc/ntp.conf.jinja - - salt://ntp/files/theminion/etc/ntp.conf_alt.jinja - - salt://ntp/files/Debian/etc/ntp.conf.jinja - - salt://ntp/files/Debian/etc/ntp.conf_alt.jinja - - salt://ntp/files/default/etc/ntp.conf.jinja - - salt://ntp/files/default/etc/ntp.conf_alt.jinja - diff --git a/kitchen.yml b/kitchen.yml index 99f4b8c..f550463 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -18,36 +18,24 @@ platforms: provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/debian.sls - name: ubuntu-1804-develop-py3 driver: image: netmanagers/salt-develop-py3:ubuntu-18.04 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/debian.sls - name: centos-7-develop-py3 driver: image: netmanagers/salt-develop-py3:centos-7 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/redhat.sls - name: fedora-29-develop-py3 driver: image: netmanagers/salt-develop-py3:fedora-29 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/redhat.sls - name: opensuse-leap-15-develop-py3 driver: image: netmanagers/salt-develop-py3:opensuse-leap-15 @@ -55,115 +43,61 @@ platforms: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop run_command: /usr/lib/systemd/systemd - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/suse.sls - ## SALT 2019.2 + ## SALT `2019.2` - name: debian-9-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:debian-9 - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/debian.sls - name: ubuntu-1804-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:ubuntu-18.04 - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/debian.sls - name: centos-7-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:centos-7 - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/redhat.sls - name: fedora-29-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:fedora-29 - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/redhat.sls - name: opensuse-leap-15-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:opensuse-leap-15 run_command: /usr/lib/systemd/systemd - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/suse.sls - ## SALT 2018.3 + ## SALT `2018.3` - name: debian-9-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:debian-9 - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/debian.sls - name: ubuntu-1604-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:ubuntu-16.04 - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/debian.sls - name: centos-7-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:centos-7 - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/redhat.sls - name: fedora-29-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:fedora-29 - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/redhat.sls - # TODO: Use this when fixed instead of `opensuse-leap-42` - # Ref: https://github.com/netmanagers/salt-image-builder/issues/2 - # - name: opensuse-leap-15-2018-3-py2 - # driver: - # image: netmanagers/salt-2018.3-py2:opensuse-leap-15 - # run_command: /usr/lib/systemd/systemd - name: opensuse-leap-42-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:opensuse-leap-42 run_command: /usr/lib/systemd/systemd - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/suse.sls - ## SALT 2017.7 + ## SALT `2017.7` - name: debian-8-2017-7-py2 driver: image: netmanagers/salt-2017.7-py2:debian-8 - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/debian.sls - name: ubuntu-1604-2017-7-py2 driver: image: netmanagers/salt-2017.7-py2:ubuntu-16.04 - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/debian.sls - name: centos-6-2017-7-py2 driver: image: netmanagers/salt-2017.7-py2:centos-6 run_command: /sbin/init - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/redhat.sls - name: fedora-28-2017-7-py2 driver: image: netmanagers/salt-2017.7-py2:fedora-28 - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/redhat.sls - name: opensuse-leap-42-2017-7-py2 driver: image: netmanagers/salt-2017.7-py2:opensuse-leap-42 run_command: /usr/lib/systemd/systemd - provisioner: - pillars_from_files: - php.sls: test/salt/pillar/suse.sls provisioner: name: salt_solo @@ -174,15 +108,6 @@ provisioner: salt_copy_filter: - .kitchen - .git - state_top: - base: - '*': - - php - pillars: - top.sls: - base: - '*': - - php verifier: # https://www.inspec.io/ @@ -191,8 +116,111 @@ verifier: # cli, documentation, html, progress, json, json-min, json-rspec, junit reporter: - cli - inspec_tests: - - path: test/integration/default suites: - name: default + excludes: + - debian-9-develop-py3 + - ubuntu-1804-develop-py3 + - centos-7-develop-py3 + - fedora-29-develop-py3 + - opensuse-leap-15-develop-py3 + - debian-9-2019-2-py3 + - ubuntu-1804-2019-2-py3 + - centos-7-2019-2-py3 + - fedora-29-2019-2-py3 + - opensuse-leap-15-2019-2-py3 + - debian-9-2018-3-py2 + - ubuntu-1604-2018-3-py2 + - centos-7-2018-3-py2 + - fedora-29-2018-3-py2 + - opensuse-leap-42-2018-3-py2 + - debian-8-2017-7-py2 + - ubuntu-1604-2017-7-py2 + - centos-6-2017-7-py2 + - fedora-28-2017-7-py2 + - opensuse-leap-42-2017-7-py2 + provisioner: + state_top: + base: + '*': + - php + pillars: + top.sls: + base: + '*': + - php + verifier: + inspec_tests: + - path: test/integration/default + - name: debian + includes: + - debian-9-develop-py3 + - ubuntu-1804-develop-py3 + - debian-9-2019-2-py3 + - ubuntu-1804-2019-2-py3 + - debian-9-2018-3-py2 + - ubuntu-1604-2018-3-py2 + - debian-8-2017-7-py2 + - ubuntu-1604-2017-7-py2 + provisioner: + state_top: + base: + '*': + - php + pillars: + top.sls: + base: + '*': + - php + pillars_from_files: + php.sls: test/salt/pillar/debian.sls + verifier: + inspec_tests: + - path: test/integration/default + - name: redhat + includes: + - centos-7-develop-py3 + - fedora-29-develop-py3 + - centos-7-2019-2-py3 + - fedora-29-2019-2-py3 + - centos-7-2018-3-py2 + - fedora-29-2018-3-py2 + - centos-6-2017-7-py2 + - fedora-28-2017-7-py2 + provisioner: + state_top: + base: + '*': + - php + pillars: + top.sls: + base: + '*': + - php + pillars_from_files: + php.sls: test/salt/pillar/redhat.sls + verifier: + inspec_tests: + - path: test/integration/default + - name: suse + includes: + - opensuse-leap-15-develop-py3 + - opensuse-leap-15-2019-2-py3 + - opensuse-leap-42-2018-3-py2 + - opensuse-leap-42-2017-7-py2 + provisioner: + state_top: + base: + '*': + - php + pillars: + top.sls: + base: + '*': + - php + pillars_from_files: + php.sls: test/salt/pillar/suse.sls + verifier: + inspec_tests: + - path: test/integration/default diff --git a/pre-commit_semantic-release.sh b/pre-commit_semantic-release.sh old mode 100644 new mode 100755 diff --git a/test/integration/default/README.md b/test/integration/default/README.md index 8019607..37cf963 100644 --- a/test/integration/default/README.md +++ b/test/integration/default/README.md @@ -1,6 +1,6 @@ -# Default InSpec Profile +# InSpec Profile: `default` -This shows the implementation of the Default InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md). +This shows the implementation of the `default` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md). ## Verify a profile diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index 870ad3f..6b77d20 100644 --- a/test/integration/default/inspec.yml +++ b/test/integration/default/inspec.yml @@ -1,6 +1,6 @@ -name: php -title: Php Formula -maintainer: Nicolas Rodriguez +name: default +title: php formula +maintainer: SaltStack Formulas license: Apache-2.0 summary: Verify that the php formula is setup and configured correctly supports: @@ -10,3 +10,5 @@ supports: - platform-name: fedora - platform-name: opensuse - platform-name: suse + - platform-name: freebsd + - platform-name: amazon