Skip to content

Commit 05b1072

Browse files
committed
Add wrapper for serverspec tests
1 parent ea4f25f commit 05b1072

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def task_run(dockerfile, configuration, task):
116116
return True
117117

118118
# build rspec/serverspec command
119-
cmd = ['bundle', 'exec', 'rspec']
119+
cmd = ['bash', 'serverspec.sh']
120120
cmd.extend(serverspec_opts)
121121

122122
# Set environment variables

tests/serverspec/serverspec.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/usr/bin/env bash
2+
3+
# Check if DOCKERFILE is set, needed for test
4+
if [[ -z "$DOCKERFILE" ]]; then
5+
echo "Environment variable 'DOCKERFILE' not set"
6+
exit 1
7+
fi
8+
9+
# Check if dockerfile exists
10+
if [[ ! -f "${DOCKERFILE}" ]]; then
11+
# Filesystem is maybe not synced?
12+
sync
13+
14+
# recheck if file is now available
15+
if [[ ! -f "${DOCKERFILE}" ]]; then
16+
echo "Dockerfile $DOCKERFILE' not found"
17+
exit 1
18+
fi
19+
fi
20+
21+
exec bundle exec rspec "$@"

0 commit comments

Comments
 (0)