From df7aca53327f9213fabea5bacaa04a9156cba2a3 Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Fri, 16 Oct 2020 22:02:52 +0200 Subject: [PATCH] ci: Remove unnecessary MODE declarations --- .github/workflows/scripts/lib/testing.sh | 4 ++-- .github/workflows/scripts/run-tests-apm-server.sh | 3 --- .github/workflows/scripts/run-tests-core.sh | 5 ----- .github/workflows/scripts/run-tests-enterprise-search.sh | 3 --- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/scripts/lib/testing.sh b/.github/workflows/scripts/lib/testing.sh index f9b8764..a044bbc 100755 --- a/.github/workflows/scripts/lib/testing.sh +++ b/.github/workflows/scripts/lib/testing.sh @@ -15,7 +15,7 @@ function container_id { local svc=$1 local label - if [[ "$MODE" == "swarm" ]]; then + if [[ "${MODE:-}" == "swarm" ]]; then label="com.docker.swarm.service.name=elk_${svc}" else label="com.docker.compose.service=${svc}" @@ -50,7 +50,7 @@ function service_ip { local ip - if [[ "$MODE" == "swarm" ]]; then + if [[ "${MODE:-}" == "swarm" ]]; then #ingress_net="$(docker network inspect ingress --format '{{ .Id }}')" #ip="$(docker service inspect elk_"$svc" --format "{{ range .Endpoint.VirtualIPs }}{{ if eq .NetworkID \"${ingress_net}\" }}{{ .Addr }}{{ end }}{{ end }}" | cut -d/ -f1)" node="$(docker node ls --format '{{ .ID }}')" diff --git a/.github/workflows/scripts/run-tests-apm-server.sh b/.github/workflows/scripts/run-tests-apm-server.sh index 317e320..f3d135d 100755 --- a/.github/workflows/scripts/run-tests-apm-server.sh +++ b/.github/workflows/scripts/run-tests-apm-server.sh @@ -7,9 +7,6 @@ set -o pipefail source "$(dirname ${BASH_SOURCE[0]})/lib/testing.sh" -declare MODE="" - - cid="$(container_id apm-server)" ip="$(service_ip apm-server)" diff --git a/.github/workflows/scripts/run-tests-core.sh b/.github/workflows/scripts/run-tests-core.sh index 9acdcc9..d4172a3 100755 --- a/.github/workflows/scripts/run-tests-core.sh +++ b/.github/workflows/scripts/run-tests-core.sh @@ -7,11 +7,6 @@ set -o pipefail source "$(dirname ${BASH_SOURCE[0]})/lib/testing.sh" -declare MODE="" -if [ "$#" -ge 1 ]; then - MODE=$1 -fi - cid_es="$(container_id elasticsearch)" cid_ls="$(container_id logstash)" cid_kb="$(container_id kibana)" diff --git a/.github/workflows/scripts/run-tests-enterprise-search.sh b/.github/workflows/scripts/run-tests-enterprise-search.sh index d379685..e0eb28a 100755 --- a/.github/workflows/scripts/run-tests-enterprise-search.sh +++ b/.github/workflows/scripts/run-tests-enterprise-search.sh @@ -7,9 +7,6 @@ set -o pipefail source "$(dirname ${BASH_SOURCE[0]})/lib/testing.sh" -declare MODE="" - - cid_es="$(container_id elasticsearch)" cid_en="$(container_id enterprise-search)"