saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
ci(kitchen+travis): use `py2` instead of `py3` for `centos-7`
This commit is contained in:
Javier Bértoli 2019-04-19 16:01:20 -03:00 committed by GitHub
commit 821deb97cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -13,7 +13,7 @@ env:
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

8
kitchen.yml
View File

@ -62,14 +62,7 @@ suites:
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:
@ -87,6 +80,7 @@ suites:
# 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'