Skip to content
This repository has been archived by the owner on Jan 23, 2024. It is now read-only.

Commit

Permalink
Start PHP/Python tests with --no-kibana (#1242)
Browse files Browse the repository at this point in the history
* Start PHP/Python tests with --no-kibana

* Linting

* To default args as well
  • Loading branch information
cachedout authored Aug 31, 2021
1 parent 21bbcfa commit ca232dd
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions .ci/scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ function prepareAndRunAll() {
--no-xpack-secure \
--apm-server-enable-tls \
--no-verify-server-cert \
--no-kibana \
--apm-server-secret-token=${ELASTIC_APM_SECRET_TOKEN} \
--apm-server-url=${APM_SERVER_URL} \
--apm-log-level=debug"
Expand Down
3 changes: 2 additions & 1 deletion .ci/scripts/php.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

srcdir=$(dirname "$0")
test -z "$srcdir" && srcdir=.
# shellcheck disable=SC1090
# shellcheck disable=SC1090,SC1091
. "${srcdir}/common.sh"

if [ -n "${APM_AGENT_PHP_VERSION}" ]; then
Expand All @@ -19,6 +19,7 @@ DEFAULT_COMPOSE_ARGS="${ELASTIC_STACK_VERSION} ${BUILD_OPTS} \
--with-agent-php-apache \
--apm-server-agent-config-poll=1s \
--force-build \
--no-kibana \
--no-xpack-secure"
export COMPOSE_ARGS=${COMPOSE_ARGS:-${DEFAULT_COMPOSE_ARGS}}
runTests env-agent-php docker-test-agent-php
3 changes: 2 additions & 1 deletion .ci/scripts/python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

srcdir=$(dirname "$0")
test -z "$srcdir" && srcdir=.
# shellcheck disable=SC1090
# shellcheck disable=SC1090,SC1091
. "${srcdir}/common.sh"

if [ -n "${APM_AGENT_PYTHON_VERSION}" ]; then
Expand All @@ -22,6 +22,7 @@ DEFAULT_COMPOSE_ARGS="${ELASTIC_STACK_VERSION} ${BUILD_OPTS} \
--with-agent-python-flask \
--apm-server-agent-config-poll=1s \
--force-build \
--no-kibana \
--no-xpack-secure \
--apm-log-level=debug"
export COMPOSE_ARGS=${COMPOSE_ARGS:-${DEFAULT_COMPOSE_ARGS}}
Expand Down

0 comments on commit ca232dd

Please sign in to comment.