Skip to content

Commit 6b4d711

Browse files
authored
Merge pull request #65 from noelmcloughlin/pip
feat(centos): epel is not hard requirement for pip
2 parents 3f8b3b9 + 155bdeb commit 6b4d711

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

kitchen.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ platforms:
1616
driver:
1717
image: netmanagers/salt-master-py3:debian-10
1818
provision_command:
19+
- apt-get install --reinstall -y udev
1920
- apt-get install -y snapd
2021
- name: ubuntu-1804-master-py3
2122
driver:
@@ -47,11 +48,13 @@ platforms:
4748
driver:
4849
image: netmanagers/salt-2019.2-py3:debian-10
4950
provision_command:
51+
- apt-get install --reinstall -y udev
5052
- apt-get install -y snapd
5153
- name: debian-9-2019-2-py3
5254
driver:
5355
image: netmanagers/salt-2019.2-py3:debian-9
5456
provision_command:
57+
- apt-get install --reinstall -y udev
5558
- apt-get install -y snapd
5659
- name: ubuntu-1804-2019-2-py3
5760
driver:
@@ -89,6 +92,7 @@ platforms:
8992
driver:
9093
image: netmanagers/salt-2018.3-py2:debian-9
9194
provision_command:
95+
- apt-get install --reinstall -y udev
9296
- apt-get install -y snapd
9397
- name: ubuntu-1604-2018-3-py2
9498
driver:

packages/osfamilymap.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ RedHat:
2727
- yum-plugin-versionlock
2828
pips:
2929
required:
30-
states:
31-
- epel
3230
pkgs:
3331
- gcc
3432
- python-devel

pillar.example

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ packages:
3535
# will take care of getting it if needed.
3636
- libpython2.7-dev
3737
- python-pip
38+
states:
39+
# if grains.os_family == 'RedHat'
40+
# not required if installing python-pip
41+
- epel
42+
3843
wanted:
3944
- dxpy
4045
- attrs

test/salt/pillar/debian.sls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---
44
# Dependency (node)
55
node:
6-
version: 12.14.1-1nodesource1
6+
version: 12.16.1-1nodesource1
77
install_from_ppa: true
88
ppa:
99
repository_url: https://deb.nodesource.com/node_12.x

test/salt/pillar/ubuntu.sls

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ packages:
3939
- libpython2.7-dev
4040
- python-pip
4141
wanted:
42-
- dxpy
42+
# TODO: Investigate why this is longer working; OK when running locally
43+
# - dxpy
4344
- attrs
4445
unwanted:
4546
- campbel

0 commit comments

Comments
 (0)