Merge pull request #50 from netmanagers/master

Fix UTF issues in 2019.2

.gitignore

@@ -47,6 +47,7 @@ coverage.xml
 .hypothesis/
 .kitchen
 .kitchen.local.yml
+kitchen.local.yml
 
 # Translations
 *.mo

.travis.yml

@@ -11,9 +11,11 @@ before_install:
 env:
   matrix:
     - INSTANCE: deb-debian-9
-    - INSTANCE: deb-ubuntu-1804
-    - INSTANCE: centos-centos-7
+    - INSTANCE: ubu16-ubuntu-1604
+    - INSTANCE: ubu18-ubuntu-1804
+    - INSTANCE: rpm-centos-7
+    - INSTANCE: fed-fedora
+    - INSTANCE: sus-opensuse-leap-salt-minion
 
 script:
   - bundle exec kitchen verify ${INSTANCE}
-

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem "test-kitchen", '>=1.20.0'
+gem "test-kitchen"
 gem "kitchen-docker"
-gem "kitchen-salt", ">=0.1.0"
+gem "kitchen-salt"
 gem "kitchen-inspec"
 

README.rst

@@ -172,7 +172,9 @@ for integration tests.
 Tested on
 
 * Debian/9
+* Debian/8 (with backports)
 * Centos/7
 * Fedora/27
+* Ubuntu/16.04
 * Ubuntu/18.04
-
+* Opensuse/leap

kitchen.yml

@@ -0,0 +1,180 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+# For help on this file's format, see https://kitchen.ci/
+driver:
+  name: docker
+
+driver_config:
+  use_sudo: false
+  privileged: true
+  provision_command: mkdir -p /run/sshd
+
+# Make sure the platforms listed below match up with
+# the `env.matrix` instances defined in `.travis.yml`
+platforms:
+  # The `run_command` used for each platform is required to
+  # test `systemd` services in docker
+  - name: debian-9
+    driver_config:
+      image: debian:9
+      run_command: /lib/systemd/systemd
+      provision_command:
+        - apt-get update && apt-get install -y udev locales
+  - name: ubuntu-18.04
+    driver_config:
+      image: ubuntu:18.04
+      run_command: /lib/systemd/systemd
+      provision_command:
+        - apt-get update && apt-get install -y udev locales
+  - name: ubuntu-16.04
+    driver_config:
+      image: ubuntu:16.04
+      run_command: /lib/systemd/systemd
+      provision_command:
+        - apt-get update && apt-get install -y udev locales
+        - locale-gen en_US.UTF-8
+        - update-locale LANG=en_US.UTF-8
+  - name: centos-7
+    driver_config:
+      image: centos:7
+      run_command: /usr/lib/systemd/systemd
+      provision_command:
+        - yum -y update && yum -y install udev git
+        # To test remote packages in RPM envs
+        - rpm --import https://zoom.us/linux/download/pubkey
+  - name: fedora
+    driver_config:
+      image: fedora
+      run_command: /usr/lib/systemd/systemd
+      provision_command:
+        - yum -y update && yum -y install udev git
+        # To test remote packages in RPM envs
+        - rpm --import https://zoom.us/linux/download/pubkey
+  # As of February 2019, there have been problems getting `opensuse` to work:
+  #   * `opensuse` is deprecated
+  #   * `opensuse/leap` grabs `15.x`, which doesn't run the `inspec` tests
+  #   * `opensuse/tumbleweed` doesn't install `salt-minion`
+  #   * `opensuse/leap:42.3` does work
+  #   * `opensuse/salt-minion` uses `42.3` with `salt-minion` pre-installed
+  - name: opensuse-leap-salt-minion
+    driver_config:
+      image: opensuse/salt-minion
+      run_command: /usr/lib/systemd/systemd
+      provision_command:
+        - zypper refresh && zypper install -y udev git glibc-locale
+        - systemctl enable sshd.service
+        - cat /etc/os-release
+        # To test remote packages in RPM envs
+        - rpm --import https://zoom.us/linux/download/pubkey
+
+provisioner:
+  name: salt_solo
+  log_level: info
+  require_chef: false
+  salt_version: latest
+  formula: packages
+  salt_copy_filter:
+    - .kitchen
+    - .git
+  pillars_from_files:
+    packages.sls: pillar.example
+  pillars:
+    top.sls:
+      base:
+        '*':
+          - packages
+  state_top:
+    base:
+      '*':
+        - packages
+
+verifier:
+  name: inspec
+  sudo: true
+  # cli, documentation, html, progress, json, json-min, json-rspec, junit
+  reporter:
+    - cli
+  inspec_tests:
+    - path: test/integration/default
+
+suites:
+  - name: deb
+    excludes:
+      - ubuntu-16.04
+      - ubuntu-18.04
+      - centos-7
+      - fedora
+      - opensuse-leap-salt-minion
+
+  - name: ubu18
+    excludes:
+      - debian-9
+      - ubuntu-16.04
+      - centos-7
+      - fedora
+      - opensuse-leap-salt-minion
+    provisioner:
+      pillars_from_files:
+        packages.sls: test/integration/default/pillar.example.ubuntu.1804
+
+  - name: ubu16
+    excludes:
+      - debian-9
+      - ubuntu-18.04
+      - centos-7
+      - fedora
+      - opensuse-leap-salt-minion
+    provisioner:
+      pillars_from_files:
+        packages.sls: test/integration/default/pillar.example.ubuntu.1604
+
+  - name: fed
+    excludes:
+      - debian-9
+      - ubuntu-16.04
+      - ubuntu-18.04
+      - centos-7
+      - opensuse-leap-salt-minion
+    provisioner:
+      pillars_from_files:
+        packages.sls: test/integration/default/pillar.example.fedora
+
+  - name: sus
+    excludes:
+      - debian-9
+      - ubuntu-16.04
+      - ubuntu-18.04
+      - centos-7
+      - fedora
+    provisioner:
+      pillars_from_files:
+        packages.sls: test/integration/default/pillar.example.opensuse
+
+  - name: rpm
+    excludes:
+      - debian-9
+      - ubuntu-16.04
+      - ubuntu-18.04
+      - fedora
+      - opensuse-leap-salt-minion
+    provisioner:
+      dependencies:
+        - name: epel
+          repo: git
+          source: https://github.com/saltstack-formulas/epel-formula.git
+      state_top:
+        base:
+          '*':
+            - epel
+            - packages
+      pillars_from_files:
+        packages.sls: test/integration/default/pillar.example.redhat
+      pillars:
+        top.sls:
+          base:
+            '*':
+            - epel
+            - packages
+        epel.sls:
+          disabled: false

packages/archives.sls

@@ -9,7 +9,7 @@ include:
 extend:
   pkg_req_pkgs:
     pkg.installed:
-      - pkgs: {{ req_packages }}
+      - pkgs: {{ req_packages | json }}
 
 {% set wanted_archives = packages.archives.required.archives %}
 {% do wanted_archives.update( packages.archives.wanted ) %}

packages/gems.sls

@@ -10,7 +10,7 @@
 ### REQ PKGS (without these, some of the WANTED GEMS will fail to install)
 gem_req_pkgs:
   pkg.installed:
-    - pkgs: {{ req_pkgs }}
+    - pkgs: {{ req_pkgs | json }}
 
 ### GEMS to install
 # (requires the ruby/rubygem deb/rpm installed, either by the system or listed in

packages/osfamilymap.yaml

@@ -5,6 +5,10 @@ Suse:
     required:
       pkgs:
         - python3-pip
+  gems:
+    required:
+      pkgs:
+        - ruby-common
 
 Debian:
   pips:

packages/pips.sls

@@ -11,7 +11,7 @@
 ### REQ PKGS (without these, some of the WANTED PIPS will fail to install)
 pip_req_pkgs:
   pkg.installed:
-    - pkgs: {{ req_pkgs }}
+    - pkgs: {{ req_pkgs | json }}
 
 {% if pip_config %}
 pip_config:
@@ -53,7 +53,7 @@ packages pips install {{ pn }}:
 packages pips remove {{ upn }}:
        {%- if grains.os_family in ('Suse',) %}
   cmd.run:
-    - name: /usr/bin/pip uninstall {{ pn }}
+    - name: /usr/bin/pip uninstall {{ upn }}
        {%- else %}
   pip.removed:
     - name: {{ upn }}