Skip to content

Commit fc6cbe0

Browse files
committed
ci: use dist: bionic & apply opensuse-leap-15 SCP error workaround
* Automated using myii/ssf-formula#22
1 parent 4c80c36 commit fc6cbe0

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=yaml
33
---
4+
dist: bionic
45
stages:
56
- test
67
- lint
@@ -10,7 +11,6 @@ stages:
1011
sudo: required
1112
cache: bundler
1213
language: ruby
13-
dist: xenial
1414

1515
services:
1616
- docker

kitchen.yml

+16
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ platforms:
4343
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
4444
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
4545
run_command: /usr/lib/systemd/systemd
46+
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
47+
# => SCP did not finish successfully (255): (Net::SCP::Error)
48+
transport:
49+
max_ssh_sessions: 1
4650
- name: amazonlinux-2-develop-py2
4751
driver:
4852
image: netmanagers/salt-develop-py2:amazonlinux-2
@@ -67,6 +71,10 @@ platforms:
6771
driver:
6872
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
6973
run_command: /usr/lib/systemd/systemd
74+
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
75+
# => SCP did not finish successfully (255): (Net::SCP::Error)
76+
transport:
77+
max_ssh_sessions: 1
7078
- name: amazonlinux-2-2019-2-py2
7179
driver:
7280
image: netmanagers/salt-2019.2-py2:amazonlinux-2
@@ -88,6 +96,10 @@ platforms:
8896
driver:
8997
image: netmanagers/salt-2018.3-py2:opensuse-leap-15
9098
run_command: /usr/lib/systemd/systemd
99+
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
100+
# => SCP did not finish successfully (255): (Net::SCP::Error)
101+
transport:
102+
max_ssh_sessions: 1
91103
- name: amazonlinux-2-2018-3-py2
92104
driver:
93105
image: netmanagers/salt-2018.3-py2:amazonlinux-2
@@ -110,6 +122,10 @@ platforms:
110122
driver:
111123
image: netmanagers/salt-2017.7-py2:opensuse-leap-15
112124
run_command: /usr/lib/systemd/systemd
125+
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
126+
# => SCP did not finish successfully (255): (Net::SCP::Error)
127+
transport:
128+
max_ssh_sessions: 1
113129
- name: amazonlinux-2-2017-7-py2
114130
driver:
115131
image: netmanagers/salt-2017.7-py2:amazonlinux-2

0 commit comments

Comments
 (0)