This commit is contained in:
Javier Bértoli 2021-11-12 23:50:39 +00:00 committed by GitHub
commit 0e81888a11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 113 additions and 51 deletions

View file

@ -447,7 +447,7 @@ suites:
provisioner:
dependencies:
- name: node
branch: test-kitchen
branch: master
repo: git
source: https://github.com/saltstack-formulas/node-formula.git
state_top:

View file

@ -27,9 +27,25 @@ gem_req_pkgs:
### GEMS to install
# (requires the ruby/rubygem deb/rpm installed, either by the system or listed in
# the required packages
# Standarize gems to format { gem: version }
{% set gem = namespace(name = '', version = '') %}
{%- for gm in wanted_gems %}
{{ gm }}:
{%- if gm is mapping %}
{%- for k,v in gm.items() %}
{%- set gem.name = k %}
{%- set gem.version = v %}
{%- endfor %}
{%- else %}
{%- set gem.name = gm %}
{%- set gem.version = 'version_undefined' %}
{%- endif %}
{{ gem.name }}-{{ gem.version }}:
gem.installed:
- name: {{ gem.name }}
{%- if gem.version != 'version_undefined' %}
- version: {{ gem.version }}
{%- endif %}
- require:
- pkg: gem_req_pkgs
{%- if req_states %}

View file

@ -22,6 +22,16 @@ CentOS Linux-8:
collides: ['snap']
symlink: true
Debian-9:
pips:
required:
pkgs:
# Pillar parameters have precedence so, if you add a package here, you
# should also add the python pip package you want. Otherwise, the formula
# will take care of getting it if needed.
- libpython2.7-dev
- python-pip
Oracle Linux Server-8:
pkgs:
required:

View file

@ -41,7 +41,7 @@ packages:
- epel
wanted:
- dxpy
- iotop
- attrs
unwanted:
- campbel
@ -57,6 +57,9 @@ packages:
wanted:
- progressbar
- minitest
# You can also specify a desired gem version
- some_gem: 1.2.3
- other: 2.3.4
unwanted:
- diff-lcs
- kitchen-vagrant

View file

@ -20,6 +20,22 @@ control 'Wanted/Required gems' do
end
end
### SPECIFIC GEMS VERSIONS
control "Specific gems' versions" do
title 'should be installed'
specific_gems = {
'regexp_parser' => '1.7.0',
'strings' => '0.1.8'
}
specific_gems.each do |p, v|
describe gem(p) do
it { should be_installed }
its('versions') { should include(v) }
end
end
end
### UNWANTED
control 'Unwanted gems' do
title 'should be uninstalled'

View file

@ -1,34 +0,0 @@
### WANTED/REQUIRED
case platform[:family]
when 'fedora', 'suse'
wanted_pips = []
else
wanted_pips = %w{
dxpy
attrs
}
end
control 'Wanted/Required python packages' do
title 'should be installed'
wanted_pips.each do |p|
describe pip(p) do
it { should be_installed }
end
end
end
### UNWANTED
control 'Unwanted python packages' do
title 'should be uninstalled'
%w{
campbel
reverse_geocode
indy-crypto
}.each do |p|
describe pip(p) do
it { should_not be_installed }
end
end
end

View file

@ -33,6 +33,8 @@ values:
- kwalify
wanted:
- progressbar
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -33,6 +33,8 @@ values:
- kwalify
wanted:
- progressbar
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -33,6 +33,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -33,6 +33,8 @@ values:
- kwalify
wanted:
- progressbar
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -33,6 +33,8 @@ values:
- kwalify
wanted:
- progressbar
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -61,6 +61,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []
@ -89,14 +91,13 @@ values:
required:
pkgs:
- libpython2.7-dev
- python-pip
states: []
unwanted:
- campbel
- reverse_geocode
- indy-crypto
wanted:
- dxpy
- iotop
- attrs
pkgs:
held:

View file

@ -61,6 +61,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []
@ -89,14 +91,13 @@ values:
required:
pkgs:
- libpython2.7-dev
- python-pip
states: []
unwanted:
- campbel
- reverse_geocode
- indy-crypto
wanted:
- dxpy
- iotop
- attrs
pkgs:
held:

View file

@ -61,6 +61,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []
@ -96,7 +98,7 @@ values:
- reverse_geocode
- indy-crypto
wanted:
- dxpy
- iotop
- attrs
pkgs:
held:

View file

@ -34,6 +34,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -34,6 +34,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -33,6 +33,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -33,6 +33,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -34,6 +34,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -34,6 +34,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -33,6 +33,8 @@ values:
- kwalify
wanted:
- progressbar
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -33,6 +33,8 @@ values:
- kwalify
wanted:
- progressbar
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -33,6 +33,8 @@ values:
- kwalify
wanted:
- progressbar
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean: []
goget: []

View file

@ -56,6 +56,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean:
- github.com/golang/example/hello

View file

@ -56,6 +56,8 @@ values:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
golang:
clean:
- github.com/golang/example/hello

View file

@ -33,6 +33,8 @@ packages:
# https://stackoverflow.com/a/50931910
# $ sudo amazon-linux-extras install ruby2.6
# - minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
unwanted:
- diff-lcs
- kitchen-vagrant

View file

@ -29,6 +29,8 @@ packages:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
unwanted:
- diff-lcs
- kitchen-vagrant

View file

@ -3,10 +3,8 @@
---
# Dependency (node)
node:
version: 12.16.1-1nodesource1
install_from_ppa: true
ppa:
repository_url: https://deb.nodesource.com/node_12.x
pkg:
use_upstream_repo: true
packages:
pkgs:
@ -41,9 +39,8 @@ packages:
# should also add the python pip package you want. Otherwise, the formula
# will take care of getting it if needed.
- libpython2.7-dev
- python-pip
wanted:
- dxpy
- iotop
- attrs
unwanted:
- campbel
@ -59,6 +56,8 @@ packages:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
unwanted:
- diff-lcs
- kitchen-vagrant

View file

@ -20,7 +20,7 @@ packages:
- python3-dnf-plugin-versionlock
pips:
wanted:
# - dxpy
# - iotop
- attrs
unwanted:
- campbel
@ -30,6 +30,8 @@ packages:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
unwanted:
- diff-lcs
- kitchen-vagrant

View file

@ -33,6 +33,8 @@ packages:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
unwanted:
- diff-lcs
- kitchen-vagrant

View file

@ -22,6 +22,8 @@ packages:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
unwanted:
- diff-lcs
- kitchen-vagrant

View file

@ -33,6 +33,8 @@ packages:
# https://stackoverflow.com/a/50931910
# $ sudo amazon-linux-extras install ruby2.6
# - minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
unwanted:
- diff-lcs
- kitchen-vagrant

View file

@ -33,6 +33,8 @@ packages:
# https://stackoverflow.com/a/50931910
# $ sudo amazon-linux-extras install ruby2.6
# - minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
unwanted:
- diff-lcs
- kitchen-vagrant

View file

@ -39,7 +39,7 @@ packages:
- python-pip
wanted:
# TODO: Investigate why this is longer working; OK when running locally
# - dxpy
# - iotop
- attrs
unwanted:
- campbel
@ -54,6 +54,8 @@ packages:
wanted:
- progressbar
- minitest
- strings: 0.1.8
- regexp_parser: 1.7.0
unwanted:
- diff-lcs
- kitchen-vagrant

View file

@ -6,7 +6,7 @@ packages:
required:
pkgs: []
wanted:
Firefox:
firefox:
package_args: "/l:en-GB"
jq:
version: '1.5'