Skip to content

Commit 60e400e

Browse files
author
Erwin Dondorp
committed
remove dependency on regular salt-stack not running
1 parent e9d4e25 commit 60e400e

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

docker/docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ services:
44
image: erwindon/saltgui-saltmaster:3007.4
55
hostname: saltmaster-local
66
ports:
7-
- 4505:4505
8-
- 4506:4506
97
- 3333:3333
108
volumes:
119
- ./srv/:/srv/

runtests.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ set -x
66
# get the needed software
77
sudo apt install -y libxss1 libgconf-2-4 libnss3 libasound2 libgtk-3-0 xvfb psmisc
88

9-
# prevent conflict with a running salt installation
10-
sudo systemctl stop salt-master salt-api
11-
# or a previous running xvfb
12-
killall Xvfb
9+
# prevent conflict with a previous running xvfb
10+
killall --quiet Xvfb
1311

1412
set -e
1513

@@ -47,7 +45,4 @@ xvfb-run npm run test:functional
4745
# remove the containers
4846
docker-compose --file docker/docker-compose.yml rm --force --stop
4947

50-
# start the usual software again
51-
sudo systemctl start salt-master salt-api
52-
5348
echo "DONE!"

0 commit comments

Comments
 (0)