Browse Source

ci: use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround

* Automated using https://github.com/myii/ssf-formula/pull/22
tags/v1.2.0
Imran Iqbal 5 years ago
parent
commit
76a2f76295
2 changed files with 17 additions and 1 deletions
  1. +1
    -1
      .travis.yml
  2. +16
    -0
      kitchen.yml

+ 1
- 1
.travis.yml View File

# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=yaml # vim: ft=yaml
--- ---
dist: bionic
stages: stages:
- test - test
- lint - lint
sudo: required sudo: required
cache: bundler cache: bundler
language: ruby language: ruby
dist: xenial


services: services:
- docker - docker

+ 16
- 0
kitchen.yml View File

- 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
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
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
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…
Cancel
Save