Skip to content

Commit

Permalink
(#47) link global node_modules to the actual test suite + Add forward…
Browse files Browse the repository at this point in the history
…er config
  • Loading branch information
svettwer committed Jun 26, 2020
1 parent 5b87ee7 commit 93f2114
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 2 deletions.
36 changes: 35 additions & 1 deletion .test/e2e/e2e-suite/testsuite.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,38 @@
testsuite.id=integrationtest
testsuite.browser=chrome
log.level=debug
selenium.chrome.arguments=--incognito --disable-dev-shm-usage --no-sandbox
selenium.chrome.arguments=--incognito --disable-dev-shm-usage --no-sandbox


#Remove when https://github.com/sakuli/sakuli-enterprise-forwarder/issues/53 is done
sakuli.forwarder.check_mk.enabled=false
sakuli.forwarder.check_mk.spooldir=/tmp/spool
sakuli.forwarder.check_mk.piggyback_hostname=Calvin
sakuli.forwarder.check_mk.section_name=check_local
sakuli.forwarder.check_mk.output.details=false

# Remove when https://github.com/sakuli/sakuli-enterprise-forwarder/issues/54 is done
sakuli.forwarder.icinga2.enabled=false
sakuli.forwarder.icinga2.api.host=localhost
sakuli.forwarder.icinga2.api.port=5665
sakuli.forwarder.icinga2.api.username=root
sakuli.forwarder.icinga2.api.password=36f8901403d59c0d
sakuli.forwarder.icinga2.hostname=sakuliclient01
sakuli.forwarder.icinga2.service_description=sakuli_demo
sakuli.forwarder.icinga2.allow_insecure_connection=true

# Remove when https://github.com/sakuli/sakuli-enterprise-forwarder/issues/55 is done
sakuli.forwarder.prometheus.enabled=false
sakuli.forwarder.prometheus.api.host=localhost
sakuli.forwarder.prometheus.api.job=prometheus-e2e-demo

# Remove whenhttps://github.com/sakuli/sakuli-enterprise-forwarder/issues/52 is done
sakuli.forwarder.gearman.enabled=false
sakuli.forwarder.gearman.encryption=true
sakuli.forwarder.gearman.secret.key=sakuli_secret
sakuli.forwarder.gearman.server.host=omd
sakuli.forwarder.gearman.server.port=4730
sakuli.forwarder.gearman.server.queue=check_results
sakuli.forwarder.gearman.nagios.hostname=sakuli_client
sakuli.forwarder.gearman.nagios.check_command=check_sakuli
sakuli.forwarder.gearman.output.details=true
8 changes: 7 additions & 1 deletion src/common/scripts/vnc_startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,17 @@ if [[ $DEBUG == true ]] || [[ $1 =~ -t|--tail-log ]]; then
tail -f $STARTUPDIR/*.log $HOME/.vnc/*$DISPLAY.log
fi

# Link global node_modules into the actual test suite
ln -s $(npm root -g | head -n 1) ${SAKULI_TEST_SUITE}/node_modules

if [ -z "$1" ] || [[ $1 =~ -w|--wait ]]; then
wait $PID_SUB
else
# unknown option ==> call command
echo -e "\n\n------------------ EXECUTE COMMAND ------------------"
echo "Executing command: '$@'"
exec "$@"
$@
fi

# Remove the link to the actual test suite as it is most likely a mounted volume
rm ${SAKULI_TEST_SUITE}/node_modules

0 comments on commit 93f2114

Please sign in to comment.