ci: use dist: bionic
& apply opensuse-leap-15
SCP error workaround
* Automated using https://github.com/myii/ssf-formula/pull/22
This commit is contained in:
parent
00159bbf3f
commit
7b44df2ef9
2 changed files with 17 additions and 1 deletions
|
@ -1,6 +1,7 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# vim: ft=yaml
|
# vim: ft=yaml
|
||||||
---
|
---
|
||||||
|
dist: bionic
|
||||||
stages:
|
stages:
|
||||||
- test
|
- test
|
||||||
- lint
|
- lint
|
||||||
|
@ -10,7 +11,6 @@ stages:
|
||||||
sudo: required
|
sudo: required
|
||||||
cache: bundler
|
cache: bundler
|
||||||
language: ruby
|
language: ruby
|
||||||
dist: xenial
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
|
|
16
kitchen.yml
16
kitchen.yml
|
@ -43,6 +43,10 @@ platforms:
|
||||||
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
|
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
|
||||||
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
|
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
|
||||||
run_command: /usr/lib/systemd/systemd
|
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
|
- name: amazonlinux-2-develop-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-develop-py2:amazonlinux-2
|
image: netmanagers/salt-develop-py2:amazonlinux-2
|
||||||
|
@ -67,6 +71,10 @@ platforms:
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
|
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
|
||||||
run_command: /usr/lib/systemd/systemd
|
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
|
- name: amazonlinux-2-2019-2-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2019.2-py2:amazonlinux-2
|
image: netmanagers/salt-2019.2-py2:amazonlinux-2
|
||||||
|
@ -88,6 +96,10 @@ platforms:
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2018.3-py2:opensuse-leap-15
|
image: netmanagers/salt-2018.3-py2:opensuse-leap-15
|
||||||
run_command: /usr/lib/systemd/systemd
|
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
|
- name: amazonlinux-2-2018-3-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2018.3-py2:amazonlinux-2
|
image: netmanagers/salt-2018.3-py2:amazonlinux-2
|
||||||
|
@ -110,6 +122,10 @@ platforms:
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2017.7-py2:opensuse-leap-15
|
image: netmanagers/salt-2017.7-py2:opensuse-leap-15
|
||||||
run_command: /usr/lib/systemd/systemd
|
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
|
- name: amazonlinux-2-2017-7-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2017.7-py2:amazonlinux-2
|
image: netmanagers/salt-2017.7-py2:amazonlinux-2
|
||||||
|
|
Loading…
Reference in a new issue