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

[jenkins] Fix Google cluster name #571

Merged
merged 1 commit into from
Apr 10, 2020
Merged

[jenkins] Fix Google cluster name #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .ci/jobs.t/elastic+helm-charts+{branch}+cluster-cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
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}
3 changes: 2 additions & 1 deletion .ci/jobs.t/elastic+helm-charts+{branch}+cluster-creation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
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}
3 changes: 2 additions & 1 deletion .ci/jobs.t/elastic+helm-charts+{branch}+integration-apm-server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
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
3 changes: 2 additions & 1 deletion .ci/jobs.t/elastic+helm-charts+{branch}+integration-elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
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
3 changes: 2 additions & 1 deletion .ci/jobs.t/elastic+helm-charts+{branch}+integration-filebeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
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
3 changes: 2 additions & 1 deletion .ci/jobs.t/elastic+helm-charts+{branch}+integration-kibana.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
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
3 changes: 2 additions & 1 deletion .ci/jobs.t/elastic+helm-charts+{branch}+integration-logstash.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
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
3 changes: 2 additions & 1 deletion .ci/jobs.t/elastic+helm-charts+{branch}+integration-metricbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x

cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
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