From 1afa84e1af2132763b6dbdaff98892dd35bf9f1c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 26 May 2020 01:31:06 +0100 Subject: [PATCH 1/4] ci(kitchen+travis): adjust matrix to add `opensuse-leap-15.2` --- .travis.yml | 2 +- kitchen.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e98228..4138656 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ jobs: - env: INSTANCE=v3000-py3-centos-8-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-opensuse-leap-151-3000-3-py3 + - env: INSTANCE=v3000-py3-opensuse-leap-152-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-1604-3000-3-py2 diff --git a/kitchen.yml b/kitchen.yml index 42a5a1e..257fec1 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -30,11 +30,11 @@ platforms: - name: fedora-31-3000-3-py3 driver: image: netmanagers/salt-3000.3-py3:fedora-31 - - name: opensuse-leap-151-3000-3-py3 + - name: opensuse-leap-152-3000-3-py3 driver: - image: netmanagers/salt-3000.3-py3:opensuse-leap-15.1 + 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.1`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 @@ -117,7 +117,7 @@ suites: - centos-8-3000-3-py3 - centos-7-3000-3-py3 - fedora-31-3000-3-py3 - - opensuse-leap-151-3000-3-py3 + - opensuse-leap-152-3000-3-py3 - amazonlinux-2-3000-3-py3 provisioner: state_top: From 7fc32fb0fb739a713c58d1642cd206106270322e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 26 May 2020 01:31:06 +0100 Subject: [PATCH 2/4] ci(kitchen+travis): adjust matrix to add `opensuse-leap-15.2` * Automated using https://github.com/myii/ssf-formula/pull/195 --- .travis.yml | 3 +-- kitchen.yml | 22 +++++++++------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4138656..db9c125 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,6 +65,7 @@ jobs: # - env: INSTANCE=v3000-py3-centos-7-3000-3-py3 - env: INSTANCE=v3000-py3-fedora-31-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-py2-ubuntu-1804-3000-3-py2 # - env: INSTANCE=v3000-py2-ubuntu-1604-3000-3-py2 @@ -74,8 +75,6 @@ jobs: - env: INSTANCE=v201902-py3-ubuntu-1604-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-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-py2-centos-6-2019-2-py2 # - env: INSTANCE=v201902-py2-amazonlinux-1-2019-2-py2 diff --git a/kitchen.yml b/kitchen.yml index 257fec1..314c194 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -38,6 +38,14 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + - name: opensuse-leap-151-3000-3-py3 + driver: + image: netmanagers/salt-3000.3-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-3000-3-py3 driver: image: netmanagers/salt-3000.3-py3:amazonlinux-2 @@ -67,17 +75,6 @@ platforms: - name: centos-7-2019-2-py3 driver: 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 driver: image: netmanagers/salt-2019.2-py3:amazonlinux-2 @@ -118,6 +115,7 @@ suites: - centos-7-3000-3-py3 - fedora-31-3000-3-py3 - opensuse-leap-152-3000-3-py3 + - opensuse-leap-151-3000-3-py3 - amazonlinux-2-3000-3-py3 provisioner: state_top: @@ -169,8 +167,6 @@ suites: - ubuntu-1604-2019-2-py3 - centos-8-2019-2-py3 - centos-7-2019-2-py3 - - fedora-31-2019-2-py3 - - opensuse-leap-151-2019-2-py3 - amazonlinux-2-2019-2-py3 provisioner: state_top: From 5d9a92bf1d567cf25916239c2b11828fe625fd17 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 26 May 2020 02:03:59 +0100 Subject: [PATCH 3/4] fix(opensuse): use appropriate upstream repo --- salt/osfamilymap.yaml | 7 ++++--- test/integration/v201902-py3/controls/pkgs_spec.rb | 5 +---- test/integration/v3000-py3/controls/pkgs_spec.rb | 7 ++++++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml index f2eecd9..8fcba19 100644 --- a/salt/osfamilymap.yaml +++ b/salt/osfamilymap.yaml @@ -4,7 +4,7 @@ {%- 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') %} {%- if salt_release.split('.')|length >= 3 %} {%- set salt_release = 'archive/' ~ salt_release %} @@ -12,6 +12,7 @@ {%- set osfamily_lower = salt['grains.get']('os_family')|lower %} {%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} {%- set oscodename = salt['grains.get']('oscodename') %} +{%- set suse_testing_repo = ':/products:/next:/testing' if [osfamily_lower, osrelease] == ['suse', '15.2'] else '' %} #from template-formula {%- if grains.os == 'MacOS' %} @@ -54,8 +55,8 @@ RedHat: Suse: 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 pyinotify: python-pyinotify gitfs: diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb index f2ae934..2039d69 100644 --- a/test/integration/v201902-py3/controls/pkgs_spec.rb +++ b/test/integration/v201902-py3/controls/pkgs_spec.rb @@ -18,10 +18,7 @@ version = 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' + '3000.3-1.fc31' end control 'salt packages' do diff --git a/test/integration/v3000-py3/controls/pkgs_spec.rb b/test/integration/v3000-py3/controls/pkgs_spec.rb index 55a7c31..2b644fe 100644 --- a/test/integration/v3000-py3/controls/pkgs_spec.rb +++ b/test/integration/v3000-py3/controls/pkgs_spec.rb @@ -21,7 +21,12 @@ version = '3000.2-1.fc31' when 'suse' # 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 control 'salt packages' do From 301a9884ac0159ead8324b6ab4eaa170943b92f8 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 26 May 2020 02:06:47 +0100 Subject: [PATCH 4/4] test(pkgs_spec): update version installed on `fedora` --- test/integration/v201902-py3/controls/pkgs_spec.rb | 3 --- test/integration/v3000-py3/controls/pkgs_spec.rb | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb index 2039d69..74a5762 100644 --- a/test/integration/v201902-py3/controls/pkgs_spec.rb +++ b/test/integration/v201902-py3/controls/pkgs_spec.rb @@ -16,9 +16,6 @@ version = when 'amazon-2' '2019.2.5-1.amzn2' end - when 'fedora' - # Issue in the upstream repo, should be `3000.3` - '3000.3-1.fc31' end control 'salt packages' do diff --git a/test/integration/v3000-py3/controls/pkgs_spec.rb b/test/integration/v3000-py3/controls/pkgs_spec.rb index 2b644fe..ef30eaa 100644 --- a/test/integration/v3000-py3/controls/pkgs_spec.rb +++ b/test/integration/v3000-py3/controls/pkgs_spec.rb @@ -17,8 +17,7 @@ version = '3000.3-1.amzn2' end when 'fedora' - # Issue in the upstream repo, should be `3000.3` - '3000.2-1.fc31' + '3000.3-1.fc31' when 'suse' # Issue in the upstream repo, should be `3000.3` case platform[:release]