From 76a2f76295362ad1361716d1710bc657bbc6b0fa Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 7 Sep 2019 03:36:54 +0100
Subject: [PATCH 1/2] ci: use `dist: bionic` & apply `opensuse-leap-15` SCP
 error workaround

* Automated using https://github.com/myii/ssf-formula/pull/22
---
 .travis.yml |  2 +-
 kitchen.yml | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9accbcf1..4d9337ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
+dist: bionic
 stages:
   - test
   - lint
@@ -10,7 +11,6 @@ stages:
 sudo: required
 cache: bundler
 language: ruby
-dist: xenial
 
 services:
   - docker
diff --git a/kitchen.yml b/kitchen.yml
index e50ea7e8..dff83501 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -43,6 +43,10 @@ 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
+    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
   - name: amazonlinux-2-develop-py2
     driver:
       image: netmanagers/salt-develop-py2:amazonlinux-2
@@ -67,6 +71,10 @@ platforms:
     driver:
       image: netmanagers/salt-2019.2-py3:opensuse-leap-15
       run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
   - name: amazonlinux-2-2019-2-py2
     driver:
       image: netmanagers/salt-2019.2-py2:amazonlinux-2
@@ -88,6 +96,10 @@ platforms:
     driver:
       image: netmanagers/salt-2018.3-py2:opensuse-leap-15
       run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
   - name: amazonlinux-2-2018-3-py2
     driver:
       image: netmanagers/salt-2018.3-py2:amazonlinux-2
@@ -110,6 +122,10 @@ platforms:
     driver:
       image: netmanagers/salt-2017.7-py2:opensuse-leap-15
       run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
   - name: amazonlinux-2-2017-7-py2
     driver:
       image: netmanagers/salt-2017.7-py2:amazonlinux-2

From 13e4e5878971bf826b56af81317cc18990da87b1 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sun, 8 Sep 2019 00:53:43 +0100
Subject: [PATCH 2/2] chore: use `semantic-release` cross-formula standard
 structure

* Automated using https://github.com/myii/ssf-formula/pull/24
---
 kitchen.yml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/kitchen.yml b/kitchen.yml
index dff83501..2d6d5ae2 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -149,22 +149,6 @@ verifier:
     - cli
 
 suites:
-  - name: default
-    includes:
-      - NONE
-    provisioner:
-      state_top:
-        base:
-          '*':
-            - php
-      pillars:
-        top.sls:
-          base:
-            '*':
-              - php
-    verifier:
-      inspec_tests:
-        - path: test/integration/default
   - name: debian
     includes:
       - debian-10-develop-py3