chore(release): 0.40.4 [skip ci]

## [0.40.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.3...v0.40.4) (2019-10-11) ### Bug Fixes * **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/postgres-formula/commit/37b0c43)) * **rubocop:** fix remaining errors manually ([](https://github.com/saltstack-formulas/postgres-formula/commit/b369aa9)) ### Continuous Integration * merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/7822200)) * **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/2c82872))
Merge pull request #292 from myii/ci/merge-rubocop-linter
2019-10-11 12:28:44 +00:00 · 2019-10-11 13:14:03 +01:00 · 2019-10-11 12:57:42 +01:00 · 2019-10-11 12:52:29 +01:00 · 2019-10-11 12:50:13 +01:00 · 2019-10-10 15:28:09 +01:00
18 changed files with 251 additions and 79 deletions
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+# General overrides used across formulas in the org
+Metrics/LineLength:
+  # Increase from default of `80`
+  # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
+  Max: 88
+
+# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
--- a/.salt-lint
+++ b/.salt-lint
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+exclude_paths: []
+skip_list:
+  # Using `salt-lint` for linting other files as well, such as Jinja macros/templates
+  - 205  # Use ".sls" as a Salt State file extension
+  # Skipping `207` and `208` because `210` is sufficient, at least for the time-being
+  # I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
+  - 207  # File modes should always be encapsulated in quotation marks
+  - 208  # File modes should always contain a leading zero
+tags: []
+verbosity: 1
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,72 +1,90 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
+## Machine config
 dist: bionic
-stages:
-  - test
-  - lint
-  - name: release
-    if: branch = master AND type != pull_request
-
 sudo: required
-cache: bundler
-language: ruby
-
 services:
  - docker

-# Make sure the instances listed below match up with
-# the `platforms` defined in `kitchen.yml`
-env:
-  matrix:
-    - INSTANCE: default-debian-10-develop-py3
-    # - INSTANCE: default-ubuntu-1804-develop-py3
-    # - INSTANCE: default-centos-7-develop-py3
-    # - INSTANCE: default-fedora-30-develop-py3
-    # - INSTANCE: default-opensuse-leap-15-develop-py3
-    # - INSTANCE: default-amazonlinux-2-develop-py2
-    # - INSTANCE: default-debian-9-2019-2-py3
-    # - INSTANCE: default-ubuntu-1804-2019-2-py3
-    - INSTANCE: default-centos-7-2019-2-py3
-    - INSTANCE: default-fedora-30-2019-2-py3
-    # - INSTANCE: default-opensuse-leap-15-2019-2-py3
-    # - INSTANCE: default-amazonlinux-2-2019-2-py2
-    # - 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
-    - INSTANCE: default-opensuse-leap-15-2018-3-py2
-    # - INSTANCE: default-amazonlinux-2-2018-3-py2
-    # - INSTANCE: default-debian-8-2017-7-py2
-    # - INSTANCE: default-ubuntu-1604-2017-7-py2
-    - INSTANCE: default-centos-6-2017-7-py2
-    # - INSTANCE: default-fedora-29-2017-7-py2
-    # - INSTANCE: default-opensuse-leap-15-2017-7-py2
-    # - INSTANCE: default-amazonlinux-2-2017-7-py2
+## Language and cache config
+language: ruby
+cache: bundler

+## Script to run for the test stage
 script:
-  - bin/kitchen verify ${INSTANCE}
+  - bin/kitchen verify "${INSTANCE}"

+## Stages and jobs matrix
+stages:
+  - test
+  - name: release
+    if: branch = master AND type != pull_request
 jobs:
  include:
-    # Define the `lint` stage (runs `yamllint` and `commitlint`)
-    - stage: lint
-      language: node_js
+    ## Define the test stage that runs the linters (and testing matrix, if applicable)
+
+    # Run all of the linters in a single job
+    - language: node_js
      node_js: lts/*
+      env: Lint
+      name: 'Lint: salt-lint, yamllint, rubocop & commitlint'
      before_install: skip
      script:
+        # Install and run `salt-lint`
+        - pip install --user salt-lint
+        - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
+                       | xargs -I {} salt-lint {}
        # Install and run `yamllint`
        # Need at least `v1.17.0` for the `yaml-files` setting
        - pip install --user yamllint>=1.17.0
        - yamllint -s .
+        # Install and run `rubocop`
+        - gem install rubocop
+        - rubocop -d
        # Install and run `commitlint`
        - npm install @commitlint/config-conventional -D
        - npm install @commitlint/travis-cli -D
        - commitlint-travis
-    # Define the release stage that runs `semantic-release`
+
+    ## Define the rest of the matrix based on Kitchen testing
+    # Make sure the instances listed below match up with
+    # the `platforms` defined in `kitchen.yml`
+    - env: INSTANCE=default-debian-10-develop-py3
+    # - env: INSTANCE=default-ubuntu-1804-develop-py3
+    # - env: INSTANCE=default-centos-7-develop-py3
+    # - env: INSTANCE=default-fedora-30-develop-py3
+    # - env: INSTANCE=default-opensuse-leap-15-develop-py3
+    # - env: INSTANCE=default-amazonlinux-2-develop-py2
+    # - env: INSTANCE=default-arch-base-latest-develop-py2
+    # - env: INSTANCE=default-debian-9-2019-2-py3
+    # - env: INSTANCE=default-ubuntu-1804-2019-2-py3
+    - env: INSTANCE=default-centos-7-2019-2-py3
+    - env: INSTANCE=default-fedora-30-2019-2-py3
+    # - env: INSTANCE=default-opensuse-leap-15-2019-2-py3
+    # - env: INSTANCE=default-amazonlinux-2-2019-2-py2
+    # - env: INSTANCE=default-arch-base-latest-2019-2-py2
+    # - env: INSTANCE=default-debian-9-2018-3-py2
+    - env: INSTANCE=default-ubuntu-1604-2018-3-py2
+    # - env: INSTANCE=default-centos-7-2018-3-py2
+    # - env: INSTANCE=default-fedora-29-2018-3-py2
+    - env: INSTANCE=default-opensuse-leap-15-2018-3-py2
+    # - env: INSTANCE=default-amazonlinux-2-2018-3-py2
+    # - env: INSTANCE=default-arch-base-latest-2018-3-py2
+    # - env: INSTANCE=default-debian-8-2017-7-py2
+    # - env: INSTANCE=default-ubuntu-1604-2017-7-py2
+    - env: INSTANCE=default-centos-6-2017-7-py2
+    # - env: INSTANCE=default-fedora-29-2017-7-py2
+    # - env: INSTANCE=default-opensuse-leap-15-2017-7-py2
+    # - env: INSTANCE=default-amazonlinux-2-2017-7-py2
+    # - env: INSTANCE=default-arch-base-latest-2017-7-py2
+
+    ## Define the release stage that runs `semantic-release`
    - stage: release
      language: node_js
      node_js: lts/*
+      env: Release
+      name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
      before_install: skip
      script:
        # Update `AUTHORS.md`
--- a/.yamllint
+++ b/.yamllint
@@ -7,10 +7,12 @@ extends: default
 # Files to ignore completely
 # 1. All YAML files under directory `node_modules/`, introduced during the Travis run
 # 2. Any SLS files under directory `test/`, which are actually state files
-# 3. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
+# 3. Any YAML files under directory `.kitchen/`, introduced during local testing
+# 4. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
 ignore: |
  node_modules/
  test/**/states/**/*.sls
+  .kitchen/
  pillar.example
  postgres/codenamemap.yaml
  postgres/osfamilymap.yaml
@@ -22,6 +24,7 @@ yaml-files:
  # Default settings
  - '*.yaml'
  - '*.yml'
+  - .salt-lint
  - .yamllint
  # SaltStack Formulas additional settings
  - '*.example'
@@ -35,3 +38,6 @@ rules:
    # Increase from default of `80`
    # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
    max: 88
+  octal-values:
+    forbid-implicit-octal: true
+    forbid-explicit-octal: true
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord

 Avatar|Contributor|Contributions
 :-:|---|:-:
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|72
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|62
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|59
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|53
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|41
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|31
@@ -70,4 +70,4 @@ Avatar|Contributor|Contributions

 ---

-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-09-13.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-11.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # Changelog

+## [0.40.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.3...v0.40.4) (2019-10-11)
+
+
+### Bug Fixes
+
+* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/postgres-formula/commit/37b0c43))
+* **rubocop:** fix remaining errors manually ([](https://github.com/saltstack-formulas/postgres-formula/commit/b369aa9))
+
+
+### Continuous Integration
+
+* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/7822200))
+* **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/2c82872))
+
+## [0.40.3](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.2...v0.40.3) (2019-10-10)
+
+
+### Bug Fixes
+
+* **manage.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/postgres-formula/commit/bf5b4d6))
+* **python.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/postgres-formula/commit/1f3cfcc))
+
+
+### Continuous Integration
+
+* **kitchen:** change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/postgres-formula/commit/7ca61f3))
+* **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/76e3e39))
+* **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/3a27978))
+* **platform:** add `arch-base-latest` (commented out for now) [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/89e4a34))
+* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/a0fdd48))
+
 ## [0.40.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2) (2019-09-13)


--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 name: postgres
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
 os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
-version: 0.40.2
+version: 0.40.4
 release: 1
 minimum_version: 2016.11
 summary: Postgres formula
--- a/7
+++ b/7
@@ -1,6 +1,7 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'

 gem 'kitchen-docker', '>= 2.9'
-gem 'kitchen-salt', '>= 0.6.0'
 gem 'kitchen-inspec', '>= 1.1'
-
+gem 'kitchen-salt', '>= 0.6.0'
--- a/bin/kitchen
+++ b/bin/kitchen
@@ -8,22 +8,25 @@
 # this file is here to facilitate running it.
 #

-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)

-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)

 if File.file?(bundle_binstub)
  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
    load(bundle_binstub)
  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+    abort(
+      'Your `bin/bundle` was not generated by Bundler, '\
+      'so this binstub cannot run.  Replace `bin/bundle` by running '\
+      '`bundle binstubs bundler --force`, then run this command again.'
+    )
  end
 end

-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'

-load Gem.bin_path("test-kitchen", "kitchen")
+load Gem.bin_path('test-kitchen', 'kitchen')
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -13,12 +13,12 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - Avatar
     - Contributor
     - Contributions
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
+     - `@myii <https://github.com/myii>`_
+     - 72
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
     - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
     - 62
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
-     - `@myii <https://github.com/myii>`_
-     - 59
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
     - `@aboe76 <https://github.com/aboe76>`_
     - 53
@@ -206,4 +206,4 @@ This list is sorted by the number of commits per contributor in *descending* ord

 ----

-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-09-13.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-11.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,43 @@
 Changelog
 =========

+`0.40.4 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.3...v0.40.4>`_ (2019-10-11)
+-------------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **rubocop:** add fixes using ``rubocop --safe-auto-correct`` (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/37b0c43>`_\ )
+* **rubocop:** fix remaining errors manually (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/b369aa9>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/7822200>`_\ )
+* **travis:** merge ``rubocop`` linter into main ``lint`` job (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/2c82872>`_\ )
+
+`0.40.3 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.2...v0.40.3>`_ (2019-10-10)
+-------------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **manage.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/bf5b4d6>`_\ )
+* **python.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/1f3cfcc>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen:** change ``log_level`` to ``debug`` instead of ``info`` (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/7ca61f3>`_\ )
+* **kitchen:** install required packages to bootstrapped ``opensuse`` [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/76e3e39>`_\ )
+* **kitchen:** use bootstrapped ``opensuse`` images until ``2019.2.2`` [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/3a27978>`_\ )
+* **platform:** add ``arch-base-latest`` (commented out for now) [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/89e4a34>`_\ )
+* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/a0fdd48>`_\ )
+
 `0.40.2 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2>`_ (2019-09-13)
 -------------------------------------------------------------------------------------------------------------

--- a/kitchen.yml
+++ b/kitchen.yml
@@ -38,11 +38,15 @@ platforms:
        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
  - name: opensuse-leap-15-develop-py3
    driver:
-      image: netmanagers/salt-develop-py3:opensuse-leap-15
+      image: opensuse/leap:15
      provision_command:
-        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
-        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+        # yamllint disable-line rule:line-length
+        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
+        - systemctl enable sshd.service
      run_command: /usr/lib/systemd/systemd
+    provisioner:
+      salt_bootstrap_options: -XdPfrq -x python3 git develop
+      salt_install: bootstrap
    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
@@ -53,6 +57,13 @@ platforms:
      provision_command:
        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
        - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
+  - name: arch-base-latest-develop-py2
+    driver:
+      image: netmanagers/salt-develop-py2:arch-base-latest
+      provision_command:
+        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+        - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
+      run_command: /usr/lib/systemd/systemd

  ## SALT `2019.2`
  - name: debian-9-2019-2-py3
@@ -69,8 +80,15 @@ platforms:
      image: netmanagers/salt-2019.2-py3:fedora-30
  - name: opensuse-leap-15-2019-2-py3
    driver:
-      image: netmanagers/salt-2019.2-py3:opensuse-leap-15
+      image: opensuse/leap:15
+      provision_command:
+        # yamllint disable-line rule:line-length
+        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
+        - systemctl enable sshd.service
      run_command: /usr/lib/systemd/systemd
+    provisioner:
+      salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
+      salt_install: bootstrap
    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
@@ -78,6 +96,10 @@ platforms:
  - name: amazonlinux-2-2019-2-py2
    driver:
      image: netmanagers/salt-2019.2-py2:amazonlinux-2
+  - name: arch-base-latest-2019-2-py2
+    driver:
+      image: netmanagers/salt-2019.2-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd

  ## SALT `2018.3`
  - name: debian-9-2018-3-py2
@@ -94,8 +116,15 @@ platforms:
      image: netmanagers/salt-2018.3-py2:fedora-29
  - name: opensuse-leap-15-2018-3-py2
    driver:
-      image: netmanagers/salt-2018.3-py2:opensuse-leap-15
+      image: opensuse/leap:15
+      provision_command:
+        # yamllint disable-line rule:line-length
+        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
+        - systemctl enable sshd.service
      run_command: /usr/lib/systemd/systemd
+    provisioner:
+      salt_bootstrap_options: -XdPfrq -x python2 git 2018.3
+      salt_install: bootstrap
    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
@@ -103,6 +132,10 @@ platforms:
  - name: amazonlinux-2-2018-3-py2
    driver:
      image: netmanagers/salt-2018.3-py2:amazonlinux-2
+  - name: arch-base-latest-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd

  ## SALT `2017.7`
  - name: debian-8-2017-7-py2
@@ -120,8 +153,15 @@ platforms:
      image: netmanagers/salt-2017.7-py2:fedora-29
  - name: opensuse-leap-15-2017-7-py2
    driver:
-      image: netmanagers/salt-2017.7-py2:opensuse-leap-15
+      image: opensuse/leap:15
+      provision_command:
+        # yamllint disable-line rule:line-length
+        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
+        - systemctl enable sshd.service
      run_command: /usr/lib/systemd/systemd
+    provisioner:
+      salt_bootstrap_options: -XdPfrq -x python2 git 2017.7
+      salt_install: bootstrap
    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
@@ -129,10 +169,14 @@ platforms:
  - name: amazonlinux-2-2017-7-py2
    driver:
      image: netmanagers/salt-2017.7-py2:amazonlinux-2
+  - name: arch-base-latest-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd

 provisioner:
  name: salt_solo
-  log_level: info
+  log_level: debug
  salt_install: none
  require_chef: false
  formula: postgres
--- a/postgres/python.sls
+++ b/postgres/python.sls
@@ -5,7 +5,7 @@ include:

 postgresql-python:
  pkg.installed:
-    - name: {{ postgres.pkg_python}}
+    - name: {{ postgres.pkg_python }}
  {% if postgres.fromrepo %}
    - fromrepo: {{ postgres.fromrepo }}
  {% endif %}
--- a/test/integration/default/controls/command_spec.rb
+++ b/test/integration/default/controls/command_spec.rb
@@ -1,14 +1,18 @@
+# frozen_string_literal: true
+
 # Overide by Platform
 pg_port = '5432'
-if platform[:family] == 'debian' or platform[:family] == 'suse'
-  pg_port = '5433'
-end
+pg_port = '5433' if (platform[:family] == 'debian') || (platform[:family] == 'suse')

 control 'Postgres command' do
  title 'should match desired lines'

  # Can't use `%Q` here due to the `\`
-  describe command(%q{su - postgres -c 'psql -p} + pg_port + %q{ -qtc "\l+ db2"'}) do
-    its(:stdout) { should match(%r{db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space}) }
+  describe command("su - postgres -c 'psql -p" + pg_port + %q( -qtc "\l+ db2"')) do
+    its(:stdout) do
+      should match(
+        /db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space/
+      )
+    end
  end
 end
--- a/test/integration/default/controls/config_spec.rb
+++ b/test/integration/default/controls/config_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 control 'Postgres configuration' do
  title 'should include the directory'

--- a/test/integration/default/controls/services_spec.rb
+++ b/test/integration/default/controls/services_spec.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # Overide by Platform
 service_name = 'postgresql'
 pg_port = 5432
-if platform[:name] == 'centos' and platform[:release].start_with?('6')
+if (platform[:name] == 'centos') && platform[:release].start_with?('6')
  service_name = 'postgresql-9.6'
-elsif platform[:family] == 'debian' or platform[:family] == 'suse'
+elsif (platform[:family] == 'debian') || (platform[:family] == 'suse')
  pg_port = 5433
 end

--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@@ -15,3 +15,4 @@ supports:
  - platform-name: suse
  - platform-name: freebsd
  - platform-name: amazon
+  - platform-name: arch
Author	SHA1	Message	Date
semantic-release-bot	3d5564843d	chore(release): 0.40.4 [skip ci] ## [0.40.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.3...v0.40.4) (2019-10-11) ### Bug Fixes * rubocop: add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/postgres-formula/commit/37b0c43)) * rubocop: fix remaining errors manually ([](https://github.com/saltstack-formulas/postgres-formula/commit/b369aa9)) ### Continuous Integration * merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/7822200)) * travis: merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/2c82872))	2019-10-11 12:28:44 +00:00
Imran Iqbal	ddd1693e50	Merge pull request #292 from myii/ci/merge-rubocop-linter ci(travis): merge `rubocop` linter into main `lint` job	2019-10-11 13:14:03 +01:00
Imran Iqbal	2c82872dd9	ci(travis): merge `rubocop` linter into main `lint` job * Semi-automated using https://github.com/myii/ssf-formula/pull/64	2019-10-11 12:57:42 +01:00
Imran Iqbal	b369aa9d40	fix(rubocop): fix remaining errors manually	2019-10-11 12:52:29 +01:00
Imran Iqbal	37b0c43839	fix(rubocop): add fixes using `rubocop --safe-auto-correct`	2019-10-11 12:50:13 +01:00
Imran Iqbal	911317c9ec	chore(issues): remove issues templates to use org-level templates [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/61	2019-10-10 15:28:09 +01:00
semantic-release-bot	a4c84df77e	chore(release): 0.40.3 [skip ci] ## [0.40.3](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.2...v0.40.3) (2019-10-10) ### Bug Fixes * manage.sls: fix `salt-lint` errors ([](https://github.com/saltstack-formulas/postgres-formula/commit/bf5b4d6)) * python.sls: fix `salt-lint` errors ([](https://github.com/saltstack-formulas/postgres-formula/commit/1f3cfcc)) ### Continuous Integration * kitchen: change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/postgres-formula/commit/7ca61f3)) * kitchen: install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/76e3e39)) * kitchen: use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/3a27978)) * platform: add `arch-base-latest` (commented out for now) [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/89e4a34)) * merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/a0fdd48))	2019-10-10 03:39:05 +00:00
Imran Iqbal	cd6eb0be16	Merge pull request #291 from myii/ci/merge-matrix-and-add-salt-lint-and-rubocop ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job	2019-10-09 23:51:09 +01:00
Imran Iqbal	a0fdd48ebb	ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job * Semi-automated using https://github.com/myii/ssf-formula/pull/60	2019-10-09 18:09:32 +01:00
Imran Iqbal	1f3cfccc0d	fix(python.sls): fix `salt-lint` errors ```bash Examining postgres/python.sls of type state [206] Jinja variables should have spaces before and after: {{ var_name }} postgres/python.sls:8 - name: {{ postgres.pkg_python}} ```	2019-10-09 18:08:20 +01:00
Imran Iqbal	bf5b4d6fd7	fix(manage.sls): fix `salt-lint` errors ```bash Examining postgres/manage.sls of type state [201] Trailing whitespace postgres/manage.sls:57 [201] Trailing whitespace postgres/manage.sls:67 ```	2019-10-09 18:08:20 +01:00
Imran Iqbal	7822200a58	ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job * Automated using https://github.com/myii/ssf-formula/pull/60	2019-10-08 16:38:21 +01:00
Imran Iqbal	e546fc3476	chore(yamllint): update ignored paths and add `octal-values` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/59	2019-10-07 19:34:02 +01:00
Imran Iqbal	4975410ca9	chore(issues): update `Bug report` & `Feature request` templates [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/58	2019-10-07 15:28:19 +01:00
Imran Iqbal	76e3e3983d	ci(kitchen): install required packages to bootstrapped `opensuse` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/53	2019-10-02 00:09:21 +01:00
Imran Iqbal	3a27978204	ci(kitchen): use bootstrapped `opensuse` images until `2019.2.2` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/52	2019-10-01 21:35:57 +01:00
Imran Iqbal	89e4a34d3d	ci(platform): add `arch-base-latest` (commented out for now) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/50	2019-10-01 16:22:29 +01:00
Imran Iqbal	934e8ff250	chore(issues): provide `Bug report` & `Feature request` templates [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/48	2019-09-30 16:00:52 +01:00
Imran Iqbal	7ca61f3fbb	ci(kitchen): change `log_level` to `debug` instead of `info` * Automated using https://github.com/myii/ssf-formula/pull/41	2019-09-23 17:01:53 +01:00