Skip to content

Commit 7e1816a

Browse files
authored
Merge pull request #85 from myii/test/fix-debian-node-and-python3-pip-settings
test(debian): fix `node` and `python3-pip` settings
2 parents 7c97573 + 79d3f7b commit 7e1816a

5 files changed

Lines changed: 6 additions & 13 deletions

File tree

kitchen.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,6 @@ suites:
554554
provisioner:
555555
dependencies:
556556
- name: node
557-
branch: test-kitchen
558557
repo: git
559558
source: https://github.com/saltstack-formulas/node-formula.git
560559
state_top:

test/integration/default/files/_mapdata/debian-10.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ values:
8888
timeout: 120
8989
required:
9090
pkgs:
91-
- libpython2.7-dev
92-
- python-pip
91+
- python3-pip
9392
states: []
9493
unwanted:
9594
- campbel

test/integration/default/files/_mapdata/debian-11.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ values:
8888
timeout: 120
8989
required:
9090
pkgs:
91-
- libpython2.7-dev
92-
- python-pip
91+
- python3-pip
9392
states: []
9493
unwanted:
9594
- campbel

test/integration/default/files/_mapdata/debian-9.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ values:
8888
timeout: 120
8989
required:
9090
pkgs:
91-
- libpython2.7-dev
92-
- python-pip
91+
- python3-pip
9392
states: []
9493
unwanted:
9594
- campbel

test/salt/pillar/debian.sls

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
---
44
# Dependency (node)
55
node:
6-
version: 12.16.1-1nodesource1
7-
install_from_ppa: true
8-
ppa:
9-
repository_url: https://deb.nodesource.com/node_12.x
6+
pkg:
7+
use_upstream_repo: true # Debian family only
108

119
packages:
1210
pkgs:
@@ -40,8 +38,7 @@ packages:
4038
# Pillar parameters have precedence so, if you add a package here, you
4139
# should also add the python pip package you want. Otherwise, the formula
4240
# will take care of getting it if needed.
43-
- libpython2.7-dev
44-
- python-pip
41+
- python3-pip
4542
wanted:
4643
# TODO: Investigate why this is longer working
4744
# - dxpy

0 commit comments

Comments
 (0)