Skip to content

Commit d78d137

Browse files
authored
Merge pull request #50 from myii/fix/use-correct-suse-package-and-update-ci-matrix
fix(osfamilymap): use correct package for `Suse` & update CI matrix
2 parents b86a0b9 + f923134 commit d78d137

File tree

3 files changed

+21
-8
lines changed

3 files changed

+21
-8
lines changed

.travis.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,26 +59,30 @@ jobs:
5959
# Make sure the instances listed below match up with
6060
# the `platforms` defined in `kitchen.yml`
6161
- env: INSTANCE=default-debian-10-master-py3
62+
# - env: INSTANCE=archive-debian-10-master-py3
63+
# - env: INSTANCE=source-debian-10-master-py3
64+
# - env: INSTANCE=repo-debian-10-master-py3
6265
# - env: INSTANCE=default-ubuntu-1804-master-py3
6366
- env: INSTANCE=default-centos-8-master-py3
64-
- env: INSTANCE=default-fedora-31-master-py3
65-
# env: INSTANCE=default-opensuse-leap-151-master-py3
66-
# env: INSTANCE=default-amazonlinux-2-master-py3
67+
# - env: INSTANCE=default-fedora-31-master-py3
68+
# - env: INSTANCE=default-opensuse-leap-151-master-py3
69+
# - env: INSTANCE=default-amazonlinux-2-master-py3
6770
# - env: INSTANCE=default-arch-base-latest-master-py2
6871
# - env: INSTANCE=default-debian-10-3000-1-py3
69-
- env: INSTANCE=default-ubuntu-1804-master-py3
72+
- env: INSTANCE=default-ubuntu-1804-3000-1-py3
7073
# - env: INSTANCE=default-centos-8-3000-1-py3
7174
# - env: INSTANCE=default-fedora-31-3000-1-py3
72-
# - env: INSTANCE=default-opensuse-leap-151-3000-1-py3
75+
- env: INSTANCE=default-opensuse-leap-151-3000-1-py3
7376
# - env: INSTANCE=default-amazonlinux-2-3000-1-py3
77+
- env: INSTANCE=archive-amazonlinux-2-3000-1-py3
7478
# - env: INSTANCE=default-arch-base-latest-3000-1-py2
7579
# - env: INSTANCE=default-debian-10-2019-2-py3
7680
# - env: INSTANCE=default-debian-9-2019-2-py3
7781
# - env: INSTANCE=default-ubuntu-1804-2019-2-py3
7882
# - env: INSTANCE=default-ubuntu-1604-2019-2-py3
7983
# - env: INSTANCE=default-centos-8-2019-2-py3
8084
# - env: INSTANCE=default-centos-7-2019-2-py3
81-
# - env: INSTANCE=default-fedora-31-2019-2-py3
85+
- env: INSTANCE=default-fedora-31-2019-2-py3
8286
# - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
8387
# - env: INSTANCE=default-amazonlinux-2-2019-2-py3
8488
# - env: INSTANCE=default-ubuntu-1804-2019-2-py2

node/osfamilymap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ RedHat:
5050

5151
Suse:
5252
pkg:
53-
name: nodejs12
53+
name: nodejs10
5454

5555
Gentoo:
5656
pkg:

test/integration/default/controls/packages_spec.rb

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,16 @@
33
control 'nodejs package' do
44
title 'should be installed'
55

6-
describe package('nodejs') do
6+
# Overide by platform
7+
package_name =
8+
case platform[:family]
9+
when 'suse'
10+
'nodejs10'
11+
else
12+
'nodejs'
13+
end
14+
15+
describe package(package_name) do
716
it { should be_installed }
817
end
918
end

0 commit comments

Comments
 (0)