From 7b44df2ef9d012a2aab258d9ad3792cca907aa9e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 7 Sep 2019 03:40:09 +0100 Subject: [PATCH] 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 b417a2d..403795e 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 93bb6c5..14ff2a1 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