Bladeren bron

Merge pull request #228 from myii/chore/ci-enable-py2-centos-7

ci(kitchen+travis): use `py2` instead of `py3` for `centos-7`
tags/v0.55.0
Javier Bértoli 5 jaren geleden
bovenliggende
commit
821deb97cb
No account linked to committer's email address
2 gewijzigde bestanden met toevoegingen van 2 en 8 verwijderingen
  1. +1
    -1
      .travis.yml
  2. +1
    -7
      kitchen.yml

+ 1
- 1
.travis.yml Bestand weergeven

matrix: matrix:
- INSTANCE: v2019-2-py3-debian-9 - INSTANCE: v2019-2-py3-debian-9
- INSTANCE: v2019-2-py3-ubuntu-1804 - INSTANCE: v2019-2-py3-ubuntu-1804
#- INSTANCE: v2019-2-py3-centos-7
- INSTANCE: v2019-2-py2-centos-7
- INSTANCE: v2019-2-py2-fedora-29 - INSTANCE: v2019-2-py2-fedora-29


- INSTANCE: v2018-3-py2-debian-8 - INSTANCE: v2018-3-py2-debian-8

+ 1
- 7
kitchen.yml Bestand weergeven

includes: includes:
- debian-9 - debian-9
- ubuntu-18.04 - ubuntu-18.04
- centos-7
provisioner: provisioner:
# If we don't force bootstrapping with python3, centos bootstraps using python2
# and then, when switching the repo to python3 and tries to install
# the packages, complains with
# Downloading packages:
# https://repo.saltstack.com/py3/re.........rpm: [Errno -1] Package does not
# match intended download. Suggestion: run yum --enablerepo=saltstack clean metadata
salt_bootstrap_options: -X -x python3 -d git %s salt_bootstrap_options: -X -x python3 -d git %s
salt_version: '2019.2' salt_version: '2019.2'
pillars: pillars:
# Fedora ships updated py2 versions in their own repos # Fedora ships updated py2 versions in their own repos
- name: v2019-2-py2 - name: v2019-2-py2
includes: includes:
- centos-7
- fedora-29 - fedora-29
provisioner: provisioner:
salt_version: '2019.2' salt_version: '2019.2'

Laden…
Annuleren
Opslaan