Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

[meta] follow-up of #1698 #1700

Merged
merged 1 commit into from
Sep 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci/jobs.t/elastic+helm-charts+{branch}+cluster-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"

cd helpers/terraform/
./in-docker make destroy KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
4 changes: 2 additions & 2 deletions .ci/jobs.t/elastic+helm-charts+{branch}+cluster-creation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"

cd helpers/terraform/
./in-docker make up KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"

cd helpers/terraform/
./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${APM_SERVER_SUITE} CHART=apm-server
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"

cd helpers/terraform/
./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${ES_SUITE} CHART=elasticsearch
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"

cd helpers/terraform/
./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${FILEBEAT_SUITE} CHART=filebeat
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"

cd helpers/terraform/
./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${KIBANA_SUITE} CHART=kibana
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"

cd helpers/terraform/
./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${LOGSTASH_SUITE} CHART=logstash
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
BRANCH_NAME="%BRANCH%"
cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"

cd helpers/terraform/
./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${METRICBEAT_SUITE} CHART=metricbeat