Skip to content

Commit 6bb9b50

Browse files
authored
Merge pull request #40 from myii/chore/standardise-structure
ci: use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround
2 parents d643418 + d2c97f4 commit 6bb9b50

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ platforms:
5252
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
5353
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
5454
run_command: /usr/lib/systemd/systemd
55+
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
56+
# => SCP did not finish successfully (255): (Net::SCP::Error)
57+
transport:
58+
max_ssh_sessions: 1
5559
- name: amazonlinux-2-develop-py2
5660
driver:
5761
image: netmanagers/salt-develop-py2:amazonlinux-2
@@ -76,6 +80,10 @@ platforms:
7680
driver:
7781
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
7882
run_command: /usr/lib/systemd/systemd
83+
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
84+
# => SCP did not finish successfully (255): (Net::SCP::Error)
85+
transport:
86+
max_ssh_sessions: 1
7987
- name: amazonlinux-2-2019-2-py2
8088
driver:
8189
image: netmanagers/salt-2019.2-py2:amazonlinux-2
@@ -97,6 +105,10 @@ platforms:
97105
driver:
98106
image: netmanagers/salt-2018.3-py2:opensuse-leap-15
99107
run_command: /usr/lib/systemd/systemd
108+
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
109+
# => SCP did not finish successfully (255): (Net::SCP::Error)
110+
transport:
111+
max_ssh_sessions: 1
100112
- name: amazonlinux-2-2018-3-py2
101113
driver:
102114
image: netmanagers/salt-2018.3-py2:amazonlinux-2
@@ -119,6 +131,10 @@ platforms:
119131
driver:
120132
image: netmanagers/salt-2017.7-py2:opensuse-leap-15
121133
run_command: /usr/lib/systemd/systemd
134+
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
135+
# => SCP did not finish successfully (255): (Net::SCP::Error)
136+
transport:
137+
max_ssh_sessions: 1
122138
- name: amazonlinux-2-2017-7-py2
123139
driver:
124140
image: netmanagers/salt-2017.7-py2:amazonlinux-2

0 commit comments

Comments
 (0)