saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Try to make centos-6 work

Browse Source
This commit is contained in:
Javier Bértoli 2019-03-31 16:55:17 -03:00
parent 5ffc1e5bc1
commit 79109b98f0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -17,13 +17,13 @@ env:
- INSTANCE: v2018-3-py2-debian-8 - INSTANCE: v2018-3-py2-debian-8
- INSTANCE: v2018-3-py2-ubuntu-1604 - INSTANCE: v2018-3-py2-ubuntu-1604
- INSTANCE: v2018-3-py2-bootstrap-2016-11-centos-6 - INSTANCE: v2018-3-py2-bootstrap-centos-6
- INSTANCE: v2018-3-py2-forced-version-fedora-28 - INSTANCE: v2018-3-py2-forced-version-fedora-28
- INSTANCE: v2018-3-py2-opensuse-423 - INSTANCE: v2018-3-py2-opensuse-423
- INSTANCE: v2017-7-py2-debian-8 - INSTANCE: v2017-7-py2-debian-8
- INSTANCE: v2017-7-py2-ubuntu-1604 - INSTANCE: v2017-7-py2-ubuntu-1604
- INSTANCE: v2017-7-py2-bootstrap-2016-11-centos-6 - INSTANCE: v2017-7-py2-bootstrap-centos-6
script: script:
- bundle exec kitchen verify ${INSTANCE} - bundle exec kitchen verify ${INSTANCE}

16
kitchen.yml
View File

@ -134,13 +134,13 @@ suites:
# To test salt on centos-6 we need to first use a python-2.6 version of salt (2016.11) # To test salt on centos-6 we need to first use a python-2.6 version of salt (2016.11)
# and then upgrade it. See https://github.com/saltstack/salt/issues/47864 # and then upgrade it. See https://github.com/saltstack/salt/issues/47864
- name: v2018-3-py2-bootstrap-2016-11 - name: v2018-3-py2-bootstrap
includes: includes:
- centos-6 - centos-6
provisioner: provisioner:
# We require an old version of salt in the provisioner or, # As centos-6 ships with python2.6, we use the bootstrapper to install python2.7
# the salt formula fails to downgrade to the desired version to test salt_bootstrap_options: -X -d stable %s
salt_version: '2016.11' salt_version: '2018.3'
pillars: pillars:
salt.sls: salt.sls:
salt: salt:
@ -190,13 +190,13 @@ suites:
# To test salt on centos-6 we need to first use a python-2.6 version of salt (2016.11) # To test salt on centos-6 we need to first use a python-2.6 version of salt (2016.11)
# and then upgrade it. See https://github.com/saltstack/salt/issues/47864 # and then upgrade it. See https://github.com/saltstack/salt/issues/47864
- name: v2017-7-py2-bootstrap-2016-11 - name: v2017-7-py2-bootstrap
includes: includes:
- centos-6 - centos-6
provisioner: provisioner:
# We require an old version of salt in the provisioner or, # As centos-6 ships with python2.6, we use the bootstrapper to install python2.7
# the salt formula fails to downgrade to the desired version to test salt_bootstrap_options: -X -d stable %s
salt_version: '2016.11' salt_version: '2017.7'
pillars: pillars:
salt.sls: salt.sls:
salt: salt: