Skip to content

Commit 03207d2

Browse files
aptalcathelamer
authored andcommitted
implement shorter test run
1 parent 4b78437 commit 03207d2

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ pipeline {
3232
CI_WEB = 'false'
3333
CI_PORT = '80'
3434
CI_SSL = 'false'
35-
CI_DELAY = '180'
36-
CI_DOCKERENV = 'CI_RUN=true'
35+
CI_DELAY = '30'
36+
CI_DOCKERENV='TEST_RUN=1'
3737
CI_AUTH = 'user:password'
3838
CI_WEBPATH = ''
3939
}

jenkins-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repo_vars:
2323
- CI_WEB = 'false'
2424
- CI_PORT = '80'
2525
- CI_SSL = 'false'
26-
- CI_DELAY = '180'
27-
- CI_DOCKERENV = 'CI_RUN=true'
26+
- CI_DELAY = '30'
27+
- CI_DOCKERENV='TEST_RUN=1'
2828
- CI_AUTH = 'user:password'
2929
- CI_WEBPATH = ''

root/etc/cont-init.d/50-config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ do
2323
[[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i"
2424
done
2525

26+
# Echo init finish for test runs
27+
if [ -n "${TEST_RUN}" ]; then
28+
echo '[services.d] done.'
29+
fi
30+
2631
# Create API key if needed
2732
if [ ! -f "/config/BOOKSTACK_APP_KEY.txt" ];
2833
then

0 commit comments

Comments
 (0)