浏览代码

Merge pull request #29 from myii/chore/standardise-structure

ci: use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround
tags/v1.2.1
Niels Abspoel 5 年前
父节点
当前提交
d0e643d7de
没有帐户链接到提交者的电子邮件
共有 2 个文件被更改,包括 17 次插入1 次删除
  1. +1
    -1
      .travis.yml
  2. +16
    -0
      kitchen.yml

+ 1
- 1
.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

+ 16
- 0
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

正在加载...
取消
保存