diff --git a/.circleci/config.yml b/.circleci/config.yml index a9bef13364..e0d9608931 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -893,6 +893,8 @@ jobs: environment: AWS_DEFAULT_REGION: us-east-2 BUCKET: consul-ci-load-tests + BASH_ENV: /etc/profile + shell: /bin/sh -leo pipefail steps: - checkout - run: apk add jq curl bash @@ -924,7 +926,6 @@ jobs: echo "export TF_VAR_consul_download_url=https://${S3_ARTIFACT_BUCKET}.s3.${AWS_DEFAULT_REGION}.amazonaws.com/${S3_ARTIFACT_PATH}/${LOCAL_COMMIT_SHA}.zip" >> $BASH_ENV - run: name: wait for dev build from test-integrations workflow - shell: /usr/bin/env bash -euo pipefail -c command: | echo "curl-ing https://${S3_ARTIFACT_BUCKET}.s3.${AWS_DEFAULT_REGION}.amazonaws.com/${S3_ARTIFACT_PATH}/${LOCAL_COMMIT_SHA}.zip" until [ $SECONDS -ge 300 ] && exit 1; do @@ -935,7 +936,6 @@ jobs: - run: working_directory: .circleci/terraform/load-test name: terraform init - shell: /usr/bin/env bash -euo pipefail -c command: | echo "commit is ${LOCAL_COMMIT_SHA}" terraform init \ @@ -946,14 +946,12 @@ jobs: - run: working_directory: .circleci/terraform/load-test name: run terraform apply - shell: /usr/bin/env bash -euo pipefail -c command: | terraform apply -auto-approve - run: working_directory: .circleci/terraform/load-test when: always name: terraform destroy - shell: /usr/bin/env bash -euo pipefail -c command: | terraform destroy -auto-approve - run: *notify-slack-failure @@ -964,7 +962,7 @@ jobs: docker: - image: docker.mirror.hashicorp.services/alpine:latest steps: - - run: 'echo ok' + - run: "echo ok" workflows: version: 2 diff --git a/.circleci/terraform/load-test/main.tf b/.circleci/terraform/load-test/main.tf index 929b5c6db2..774e19c602 100644 --- a/.circleci/terraform/load-test/main.tf +++ b/.circleci/terraform/load-test/main.tf @@ -20,4 +20,5 @@ module "load-test" { test_public_ip = true ami_owners = var.ami_owners consul_download_url = var.consul_download_url + cluster_name = var.cluster_name } diff --git a/.circleci/terraform/load-test/variables.tf b/.circleci/terraform/load-test/variables.tf index c503a00966..9b3849e4ea 100644 --- a/.circleci/terraform/load-test/variables.tf +++ b/.circleci/terraform/load-test/variables.tf @@ -16,4 +16,9 @@ variable "consul_download_url" { type = string description = "URL to download the Consul binary from" default = "" -} \ No newline at end of file +} +variable "cluster_name" { + description = "What to name the Consul cluster and all of its associated resources" + type = string + default = "consul-example" +}