Browse Source

Merge pull request #467 from myii/ci/add-opensuse-leap-15.2

ci(kitchen+travis): adjust matrix to add `opensuse-leap-15.2`
tags/v1.4.2
Imran Iqbal 4 years ago
parent
commit
972fc63d3d
No account linked to committer's email address
5 changed files with 22 additions and 28 deletions
  1. +2
    -3
      .travis.yml
  2. +9
    -13
      kitchen.yml
  3. +4
    -3
      salt/osfamilymap.yaml
  4. +0
    -6
      test/integration/v201902-py3/controls/pkgs_spec.rb
  5. +7
    -3
      test/integration/v3000-py3/controls/pkgs_spec.rb

+ 2
- 3
.travis.yml View File

- env: INSTANCE=v3000-py3-centos-8-3000-3-py3 - env: INSTANCE=v3000-py3-centos-8-3000-3-py3
# - env: INSTANCE=v3000-py3-centos-7-3000-3-py3 # - env: INSTANCE=v3000-py3-centos-7-3000-3-py3
- env: INSTANCE=v3000-py3-fedora-31-3000-3-py3 - env: INSTANCE=v3000-py3-fedora-31-3000-3-py3
# - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-3-py3
- env: INSTANCE=v3000-py3-opensuse-leap-152-3000-3-py3
- env: INSTANCE=v3000-py3-opensuse-leap-151-3000-3-py3
- env: INSTANCE=v3000-py3-amazonlinux-2-3000-3-py3 - env: INSTANCE=v3000-py3-amazonlinux-2-3000-3-py3
- env: INSTANCE=v3000-py2-ubuntu-1804-3000-3-py2 - env: INSTANCE=v3000-py2-ubuntu-1804-3000-3-py2
# - env: INSTANCE=v3000-py2-ubuntu-1604-3000-3-py2 # - env: INSTANCE=v3000-py2-ubuntu-1604-3000-3-py2
- env: INSTANCE=v201902-py3-ubuntu-1604-2019-2-py3 - env: INSTANCE=v201902-py3-ubuntu-1604-2019-2-py3
# - env: INSTANCE=v201902-py3-centos-8-2019-2-py3 # - env: INSTANCE=v201902-py3-centos-8-2019-2-py3
- env: INSTANCE=v201902-py3-centos-7-2019-2-py3 - env: INSTANCE=v201902-py3-centos-7-2019-2-py3
# - env: INSTANCE=v201902-py3-fedora-31-2019-2-py3
- env: INSTANCE=v201902-py3-opensuse-leap-151-2019-2-py3
# - env: INSTANCE=v201902-py3-amazonlinux-2-2019-2-py3 # - env: INSTANCE=v201902-py3-amazonlinux-2-2019-2-py3
- env: INSTANCE=v201902-py2-centos-6-2019-2-py2 - env: INSTANCE=v201902-py2-centos-6-2019-2-py2
# - env: INSTANCE=v201902-py2-amazonlinux-1-2019-2-py2 # - env: INSTANCE=v201902-py2-amazonlinux-1-2019-2-py2

+ 9
- 13
kitchen.yml View File

- name: fedora-31-3000-3-py3 - name: fedora-31-3000-3-py3
driver: driver:
image: netmanagers/salt-3000.3-py3:fedora-31 image: netmanagers/salt-3000.3-py3:fedora-31
- name: opensuse-leap-152-3000-3-py3
driver:
image: netmanagers/salt-3000.3-py3:opensuse-leap-15.2
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-leap-151-3000-3-py3 - name: opensuse-leap-151-3000-3-py3
driver: driver:
image: netmanagers/salt-3000.3-py3:opensuse-leap-15.1 image: netmanagers/salt-3000.3-py3:opensuse-leap-15.1
- name: centos-7-2019-2-py3 - name: centos-7-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:centos-7 image: netmanagers/salt-2019.2-py3:centos-7
- name: fedora-31-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:fedora-31
- name: opensuse-leap-151-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: amazonlinux-2-2019-2-py3 - name: amazonlinux-2-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:amazonlinux-2 image: netmanagers/salt-2019.2-py3:amazonlinux-2
- centos-8-3000-3-py3 - centos-8-3000-3-py3
- centos-7-3000-3-py3 - centos-7-3000-3-py3
- fedora-31-3000-3-py3 - fedora-31-3000-3-py3
- opensuse-leap-152-3000-3-py3
- opensuse-leap-151-3000-3-py3 - opensuse-leap-151-3000-3-py3
- amazonlinux-2-3000-3-py3 - amazonlinux-2-3000-3-py3
provisioner: provisioner:
- ubuntu-1604-2019-2-py3 - ubuntu-1604-2019-2-py3
- centos-8-2019-2-py3 - centos-8-2019-2-py3
- centos-7-2019-2-py3 - centos-7-2019-2-py3
- fedora-31-2019-2-py3
- opensuse-leap-151-2019-2-py3
- amazonlinux-2-2019-2-py3 - amazonlinux-2-2019-2-py3
provisioner: provisioner:
state_top: state_top:

+ 4
- 3
salt/osfamilymap.yaml View File



{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %} {%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}


{%- set osrelease = salt['grains.get']('osrelease') %}
{%- set osrelease = salt['grains.get']('osrelease', '') %}
{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %} {%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
{%- if salt_release.split('.')|length >= 3 %} {%- if salt_release.split('.')|length >= 3 %}
{%- set salt_release = 'archive/' ~ salt_release %} {%- set salt_release = 'archive/' ~ salt_release %}
{%- set osfamily_lower = salt['grains.get']('os_family')|lower %} {%- set osfamily_lower = salt['grains.get']('os_family')|lower %}
{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} {%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
{%- set oscodename = salt['grains.get']('oscodename') %} {%- set oscodename = salt['grains.get']('oscodename') %}
{%- set suse_testing_repo = ':/products:/next:/testing' if [osfamily_lower, osrelease] == ['suse', '15.2'] else '' %}


#from template-formula #from template-formula
{%- if grains.os == 'MacOS' %} {%- if grains.os == 'MacOS' %}


Suse: Suse:
pkgrepo_humanname: 'Salt releases for SLE-based SUSE products (openSUSE_Leap_{{ osrelease }})' pkgrepo_humanname: 'Salt releases for SLE-based SUSE products (openSUSE_Leap_{{ osrelease }})'
pkgrepo: 'http://repo.saltstack.com/opensuse/openSUSE_Leap_{{ osrelease }}/'
key_url: 'http://repo.saltstack.com/opensuse/openSUSE_Leap_{{ osrelease }}/repodata/repomd.xml.key'
pkgrepo: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack{{ suse_testing_repo }}/openSUSE_Leap_{{ osrelease }}/'
key_url: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack{{ suse_testing_repo }}/openSUSE_Leap_{{ osrelease }}/repodata/repomd.xml.key'
pygit2: python-pygit2 pygit2: python-pygit2
pyinotify: python-pyinotify pyinotify: python-pyinotify
gitfs: gitfs:

+ 0
- 6
test/integration/v201902-py3/controls/pkgs_spec.rb View File

when 'amazon-2' when 'amazon-2'
'2019.2.5-1.amzn2' '2019.2.5-1.amzn2'
end end
when 'fedora'
# Issue in the upstream repo, should be `3000.3`
'3000.2-1.fc31'
when 'suse'
# Issue in the upstream repo, should be `2019.2.5`
'2019.2.0-lp151.37.1'
end end


control 'salt packages' do control 'salt packages' do

+ 7
- 3
test/integration/v3000-py3/controls/pkgs_spec.rb View File

'3000.3-1.amzn2' '3000.3-1.amzn2'
end end
when 'fedora' when 'fedora'
# Issue in the upstream repo, should be `3000.3`
'3000.2-1.fc31'
'3000.3-1.fc31'
when 'suse' when 'suse'
# Issue in the upstream repo, should be `3000.3` # Issue in the upstream repo, should be `3000.3`
'2019.2.0-lp151.37.1'
case platform[:release]
when /^15.2/
'3000.2-lp152.7.1'
when /^15.1/
'3000.2-lp151.2.1'
end
end end


control 'salt packages' do control 'salt packages' do

Loading…
Cancel
Save