From b188e495296f884bb4481c219825689aa5084c24 Mon Sep 17 00:00:00 2001 From: Chris Koehnke Date: Wed, 18 Mar 2020 17:13:56 -0400 Subject: [PATCH 1/3] Staging image testing Add a multijob for performing tests with staging images based on a BUILD_ID. The terraform helper now can create a docker registry secret in kubernetes. The bumper scripts now adds an `imagePullSecrets` entry to support pulling from the private registry, and additionally handling to ensure goss tests work when using BUILD_ID values as a bumped version. Allow the makefile help generator to support goals that include numbers. --- ...ic+helm-charts+staging+cluster-cleanup.yml | 41 ++++++++++++++++ ...c+helm-charts+staging+cluster-creation.yml | 42 ++++++++++++++++ ...-charts+staging+integration-apm-server.yml | 45 +++++++++++++++++ ...arts+staging+integration-elasticsearch.yml | 45 +++++++++++++++++ ...lm-charts+staging+integration-filebeat.yml | 45 +++++++++++++++++ ...helm-charts+staging+integration-kibana.yml | 45 +++++++++++++++++ ...lm-charts+staging+integration-logstash.yml | 45 +++++++++++++++++ ...-charts+staging+integration-metricbeat.yml | 45 +++++++++++++++++ .ci/jobs/elastic+helm-charts+staging.yml | 49 +++++++++++++++++++ helpers/bumper.py | 33 ++++++++++++- helpers/common.mk | 2 +- helpers/examples.mk | 2 +- helpers/terraform/Makefile | 10 +++- 13 files changed, 445 insertions(+), 4 deletions(-) create mode 100644 .ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml create mode 100644 .ci/jobs/elastic+helm-charts+staging+cluster-creation.yml create mode 100644 .ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml create mode 100644 .ci/jobs/elastic+helm-charts+staging+integration-elasticsearch.yml create mode 100644 .ci/jobs/elastic+helm-charts+staging+integration-filebeat.yml create mode 100644 .ci/jobs/elastic+helm-charts+staging+integration-kibana.yml create mode 100644 .ci/jobs/elastic+helm-charts+staging+integration-logstash.yml create mode 100644 .ci/jobs/elastic+helm-charts+staging+integration-metricbeat.yml create mode 100644 .ci/jobs/elastic+helm-charts+staging.yml diff --git a/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml b/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml new file mode 100644 index 000000000..3f4e8b242 --- /dev/null +++ b/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml @@ -0,0 +1,41 @@ +--- +- job: + name: elastic+helm-charts+master+cluster-cleanup + display-name: elastic / helm-charts - master - cluster cleanup + description: Master - cluster cleanup + parameters: + - string: + name: BUILD_ID + description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)" + scm: + - git: + wipe-workspace: 'True' + axes: + - axis: + type: slave + name: label + values: + - docker&&virtual + - axis: + type: yaml + name: KUBERNETES_VERSION + filename: helpers/matrix.yml + builders: + - shell: |- + #!/usr/local/bin/runbld + set -euo pipefail + + source /usr/local/bin/bash_standard_lib.sh + + set +x + VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") + export VAULT_TOKEN + unset VAULT_ROLE_ID VAULT_SECRET_ID + set -x + + env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py + + cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}" + + cd helpers/terraform/ + ./in-docker make destroy KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} diff --git a/.ci/jobs/elastic+helm-charts+staging+cluster-creation.yml b/.ci/jobs/elastic+helm-charts+staging+cluster-creation.yml new file mode 100644 index 000000000..00d5f7975 --- /dev/null +++ b/.ci/jobs/elastic+helm-charts+staging+cluster-creation.yml @@ -0,0 +1,42 @@ +--- +- job: + name: elastic+helm-charts+staging+cluster-creation + display-name: elastic / helm-charts - staging - cluster creation + description: staging - cluster creation + parameters: + - string: + name: BUILD_ID + description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)" + scm: + - git: + wipe-workspace: 'True' + axes: + - axis: + type: slave + name: label + values: + - docker&&virtual + - axis: + type: yaml + name: KUBERNETES_VERSION + filename: helpers/matrix.yml + builders: + - shell: |- + #!/usr/local/bin/runbld + set -euo pipefail + + source /usr/local/bin/bash_standard_lib.sh + + set +x + VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") + export VAULT_TOKEN + unset VAULT_ROLE_ID VAULT_SECRET_ID + set -x + + env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py + + cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}" + + cd helpers/terraform/ + ./in-docker make up KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} + ./in-docker make k8s-staging-registry KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml b/.ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml new file mode 100644 index 000000000..c13888b06 --- /dev/null +++ b/.ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml @@ -0,0 +1,45 @@ +--- +- job: + name: elastic+helm-charts+master+integration-apm-server + display-name: elastic / helm-charts - master - integration apm-server + description: Master - integration apm-server + parameters: + - string: + name: BUILD_ID + description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)" + scm: + - git: + wipe-workspace: 'True' + axes: + - axis: + type: slave + name: label + values: + - docker&&virtual + - axis: + type: yaml + name: APM_SERVER_SUITE + filename: helpers/matrix.yml + - axis: + type: yaml + name: KUBERNETES_VERSION + filename: helpers/matrix.yml + builders: + - shell: |- + #!/usr/local/bin/runbld + set -euo pipefail + + source /usr/local/bin/bash_standard_lib.sh + + set +x + VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") + export VAULT_TOKEN + unset VAULT_ROLE_ID VAULT_SECRET_ID + set -x + + env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py + + cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}" + + cd helpers/terraform/ + ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${APM_SERVER_SUITE} CHART=apm-server diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-elasticsearch.yml b/.ci/jobs/elastic+helm-charts+staging+integration-elasticsearch.yml new file mode 100644 index 000000000..607f92b00 --- /dev/null +++ b/.ci/jobs/elastic+helm-charts+staging+integration-elasticsearch.yml @@ -0,0 +1,45 @@ +--- +- job: + name: elastic+helm-charts+staging+integration-elasticsearch + display-name: elastic / helm-charts - staging - integration elasticsearch + description: staging - integration elasticsearch + parameters: + - string: + name: BUILD_ID + description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)" + scm: + - git: + wipe-workspace: 'True' + axes: + - axis: + type: slave + name: label + values: + - docker&&virtual + - axis: + type: yaml + name: ES_SUITE + filename: helpers/matrix.yml + - axis: + type: yaml + name: KUBERNETES_VERSION + filename: helpers/matrix.yml + builders: + - shell: |- + #!/usr/local/bin/runbld + set -euo pipefail + + source /usr/local/bin/bash_standard_lib.sh + + set +x + VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") + export VAULT_TOKEN + unset VAULT_ROLE_ID VAULT_SECRET_ID + set -x + + env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py + + cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}" + + cd helpers/terraform/ + ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${ES_SUITE} CHART=elasticsearch diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-filebeat.yml b/.ci/jobs/elastic+helm-charts+staging+integration-filebeat.yml new file mode 100644 index 000000000..f0d227cd3 --- /dev/null +++ b/.ci/jobs/elastic+helm-charts+staging+integration-filebeat.yml @@ -0,0 +1,45 @@ +--- +- job: + name: elastic+helm-charts+staging+integration-filebeat + display-name: elastic / helm-charts - staging - integration filebeat + description: staging - integration filebeat + parameters: + - string: + name: BUILD_ID + description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)" + scm: + - git: + wipe-workspace: 'True' + axes: + - axis: + type: slave + name: label + values: + - docker&&virtual + - axis: + type: yaml + name: FILEBEAT_SUITE + filename: helpers/matrix.yml + - axis: + type: yaml + name: KUBERNETES_VERSION + filename: helpers/matrix.yml + builders: + - shell: |- + #!/usr/local/bin/runbld + set -euo pipefail + + source /usr/local/bin/bash_standard_lib.sh + + set +x + VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") + export VAULT_TOKEN + unset VAULT_ROLE_ID VAULT_SECRET_ID + set -x + + env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py + + cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}" + + cd helpers/terraform/ + ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${FILEBEAT_SUITE} CHART=filebeat diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-kibana.yml b/.ci/jobs/elastic+helm-charts+staging+integration-kibana.yml new file mode 100644 index 000000000..f4a8e402b --- /dev/null +++ b/.ci/jobs/elastic+helm-charts+staging+integration-kibana.yml @@ -0,0 +1,45 @@ +--- +- job: + name: elastic+helm-charts+staging+integration-kibana + display-name: elastic / helm-charts - staging - integration kibana + description: staging - integration kibana + parameters: + - string: + name: BUILD_ID + description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)" + scm: + - git: + wipe-workspace: 'True' + axes: + - axis: + type: slave + name: label + values: + - docker&&virtual + - axis: + type: yaml + name: KIBANA_SUITE + filename: helpers/matrix.yml + - axis: + type: yaml + name: KUBERNETES_VERSION + filename: helpers/matrix.yml + builders: + - shell: |- + #!/usr/local/bin/runbld + set -euo pipefail + + source /usr/local/bin/bash_standard_lib.sh + + set +x + VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") + export VAULT_TOKEN + unset VAULT_ROLE_ID VAULT_SECRET_ID + set -x + + env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py + + cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}" + + cd helpers/terraform/ + ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${KIBANA_SUITE} CHART=kibana diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-logstash.yml b/.ci/jobs/elastic+helm-charts+staging+integration-logstash.yml new file mode 100644 index 000000000..01fcefe23 --- /dev/null +++ b/.ci/jobs/elastic+helm-charts+staging+integration-logstash.yml @@ -0,0 +1,45 @@ +--- +- job: + name: elastic+helm-charts+staging+integration-logstash + display-name: elastic / helm-charts - staging - integration logstash + description: staging - integration logstash + parameters: + - string: + name: BUILD_ID + description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)" + scm: + - git: + wipe-workspace: 'True' + axes: + - axis: + type: slave + name: label + values: + - docker&&virtual + - axis: + type: yaml + name: LOGSTASH_SUITE + filename: helpers/matrix.yml + - axis: + type: yaml + name: KUBERNETES_VERSION + filename: helpers/matrix.yml + builders: + - shell: |- + #!/usr/local/bin/runbld + set -euo pipefail + + source /usr/local/bin/bash_standard_lib.sh + + set +x + VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") + export VAULT_TOKEN + unset VAULT_ROLE_ID VAULT_SECRET_ID + set -x + + env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py + + cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}" + + cd helpers/terraform/ + ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${LOGSTASH_SUITE} CHART=logstash diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-metricbeat.yml b/.ci/jobs/elastic+helm-charts+staging+integration-metricbeat.yml new file mode 100644 index 000000000..940a06e3d --- /dev/null +++ b/.ci/jobs/elastic+helm-charts+staging+integration-metricbeat.yml @@ -0,0 +1,45 @@ +--- +- job: + name: elastic+helm-charts+staging+integration-metricbeat + display-name: elastic / helm-charts - staging - integration metricbeat + description: staging - integration metricbeat + parameters: + - string: + name: BUILD_ID + description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)" + scm: + - git: + wipe-workspace: 'True' + axes: + - axis: + type: slave + name: label + values: + - docker&&virtual + - axis: + type: yaml + name: METRICBEAT_SUITE + filename: helpers/matrix.yml + - axis: + type: yaml + name: KUBERNETES_VERSION + filename: helpers/matrix.yml + builders: + - shell: |- + #!/usr/local/bin/runbld + set -euo pipefail + + source /usr/local/bin/bash_standard_lib.sh + + set +x + VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") + export VAULT_TOKEN + unset VAULT_ROLE_ID VAULT_SECRET_ID + set -x + + env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py + + cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}" + + cd helpers/terraform/ + ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${METRICBEAT_SUITE} CHART=metricbeat diff --git a/.ci/jobs/elastic+helm-charts+staging.yml b/.ci/jobs/elastic+helm-charts+staging.yml new file mode 100644 index 000000000..2127d9d87 --- /dev/null +++ b/.ci/jobs/elastic+helm-charts+staging.yml @@ -0,0 +1,49 @@ +--- +- job: + name: elastic+helm-charts+staging + display-name: elastic / helm-charts - staging + description: Staging image testing + concurrent: true + parameters: + - string: + name: BUILD_ID + description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)" + project-type: multijob + scm: + - git: + wipe-workspace: 'False' + triggers: + - timed: H H(02-04) * * * + - github + builders: + - multijob: + name: template testing and kubernetes cluster creation + condition: SUCCESSFUL + projects: + - name: elastic+helm-charts+staging+cluster-creation + current-parameters: true + - multijob: + name: elasticsearch integration testing + condition: ALWAYS + projects: + - name: elastic+helm-charts+staging+integration-elasticsearch + current-parameters: true + - multijob: + name: integration testing + condition: ALWAYS + projects: + - name: elastic+helm-charts+staging+integration-kibana + current-parameters: true + - name: elastic+helm-charts+staging+integration-filebeat + current-parameters: true + - name: elastic+helm-charts+staging+integration-metricbeat + current-parameters: true + - name: elastic+helm-charts+staging+integration-logstash + current-parameters: true + - name: elastic+helm-charts+staging+integration-apm-server + current-parameters: true + publishers: + - trigger-parameterized-builds: + - project: elastic+helm-charts+staging+cluster-cleanup + current-parameters: true + trigger-with-no-params: false diff --git a/helpers/bumper.py b/helpers/bumper.py index af5088c67..7fbb6548d 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -27,7 +27,6 @@ chart_version = versions[7] file_patterns = [ - "*/examples/*/test/goss*.y*ml", "*/examples/*/*.y*ml", "helpers/examples.mk", "*/README.md", @@ -35,10 +34,15 @@ "*/Chart.y*ml", ] +goss_files = ["*/examples/*/test/goss*.y*ml"] + + # Anything matching this regex won't have version bumps changed # This was happening because strings like 127.0.0.1 match for 7.0.0 blacklist = re.compile(r".*127.0.0.1.*") +print("Updating versions...") + for major, version in versions.iteritems(): r = re.compile(r"{0}\.[0-9]*\.[0-9]*-?[0-9]?".format(major)) for pattern in file_patterns: @@ -52,6 +56,19 @@ print(r.sub(chart_version, line.rstrip())) else: print(r.sub(version, line.rstrip())) + for pattern in goss_files: + for f in glob.glob(pattern): + print(f) + for line in fileinput.input([f], inplace=True): + # If we have a version with a build id, like 7.6.2-abcdabcd, + # strip off the latter part and only use the 7.6.2 in the goss + # tests + version_without_build_id = re.sub(r"-.*", "", version) + if re.match(blacklist, line): + print(line.rstrip()) + else: + print(r.sub(version_without_build_id, line.rstrip())) + if os.environ.get("BUMPER_USE_STAGING_IMAGES") == "true": image_file_patterns = file_patterns + [ @@ -60,6 +77,8 @@ "**/Makefile", ] + print("\nUpdating namespaces...") + for pattern in image_file_patterns: for f in glob.glob(pattern): print(f) @@ -71,3 +90,15 @@ line.rstrip(), ) ) + + print("\nUpdating imagePullSecrets...") + + for f in glob.glob("*/values.y*ml"): + print(f) + for line in fileinput.input([f], inplace=True): + print( + line.rstrip().replace( + "imagePullSecrets: []", + "imagePullSecrets: [{name: registry-staging}]", + ) + ) diff --git a/helpers/common.mk b/helpers/common.mk index 8ced63fca..d98b0c61f 100644 --- a/helpers/common.mk +++ b/helpers/common.mk @@ -4,7 +4,7 @@ default: test .PHONY: help help: ## Display this help - @awk 'BEGIN {FS = ":.*##"; printf "Usage: make \033[36m\033[0m\n\nTargets:\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-10s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST) + @awk 'BEGIN {FS = ":.*##"; printf "Usage: make \033[36m\033[0m\n\nTargets:\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf " \033[36m%-10s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST) .PHONY: build build: ## Build helm-tester docker image diff --git a/helpers/examples.mk b/helpers/examples.mk index 72ee14cb5..e4ca9ff0f 100644 --- a/helpers/examples.mk +++ b/helpers/examples.mk @@ -5,7 +5,7 @@ STACK_VERSION := 7.6.1 .PHONY: help help: ## Display this help - @awk 'BEGIN {FS = ":.*##"; printf "Usage: make \033[36m\033[0m\n\nTargets:\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-10s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST) + @awk 'BEGIN {FS = ":.*##"; printf "Usage: make \033[36m\033[0m\n\nTargets:\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf " \033[36m%-10s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST) .PHONY: goss goss: ## Run goss tests diff --git a/helpers/terraform/Makefile b/helpers/terraform/Makefile index aa8646956..0a49903f0 100644 --- a/helpers/terraform/Makefile +++ b/helpers/terraform/Makefile @@ -13,7 +13,7 @@ export TF_VAR_kubernetes_version=$(KUBERNETES_VERSION) .PHONY: help help: ## Display this help - @awk 'BEGIN {FS = ":.*##"; printf "Usage: make \033[36m\033[0m\n\nTargets:\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-10s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST) + @awk 'BEGIN {FS = ":.*##"; printf "Usage: make \033[36m\033[0m\n\nTargets:\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf " \033[36m%-10s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST) .PHONY: clean clean: ## Delete terraform working directory and local state files @@ -69,6 +69,14 @@ creds: credentials.json ## Get gke credentials k8s: apply creds ## Configure gke cluster kubectl get cs +.PHONY: k8s-staging-registry +k8s-staging-registry: creds ## Create the staging registry auth secret in k8s + @DOCKER_PASSWORD="$$(vault read -field=password secret/devops-ci/docker.elastic.co/devops-ci)" && \ + kubectl create secret docker-registry registry-staging \ + --docker-server="docker.elastic.co" \ + --docker-username="devops-ci" \ + --docker-password="$$DOCKER_PASSWORD" + .PHONY: up up: k8s ## Install helm on gke cluster kubectl create clusterrolebinding add-on-cluster-admin --clusterrole=cluster-admin --serviceaccount=kube-system:default || true From bf76aef3a4a0509f0f42ef2c9c693ba6662aa44b Mon Sep 17 00:00:00 2001 From: Chris Koehnke Date: Thu, 19 Mar 2020 13:57:45 -0400 Subject: [PATCH 2/3] fix job names --- .ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml | 6 +++--- .../elastic+helm-charts+staging+integration-apm-server.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml b/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml index 3f4e8b242..e4cb2d602 100644 --- a/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml +++ b/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml @@ -1,8 +1,8 @@ --- - job: - name: elastic+helm-charts+master+cluster-cleanup - display-name: elastic / helm-charts - master - cluster cleanup - description: Master - cluster cleanup + name: elastic+helm-charts+staging+cluster-cleanup + display-name: elastic / helm-charts - staging - cluster cleanup + description: staging - cluster cleanup parameters: - string: name: BUILD_ID diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml b/.ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml index c13888b06..cba2c4a69 100644 --- a/.ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml +++ b/.ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml @@ -1,8 +1,8 @@ --- - job: - name: elastic+helm-charts+master+integration-apm-server - display-name: elastic / helm-charts - master - integration apm-server - description: Master - integration apm-server + name: elastic+helm-charts+staging+integration-apm-server + display-name: elastic / helm-charts - staging - integration apm-server + description: staging - integration apm-server parameters: - string: name: BUILD_ID From c852fe467a9e17bc3d5cd55460fafe36b02c609a Mon Sep 17 00:00:00 2001 From: Chris Koehnke Date: Mon, 23 Mar 2020 14:14:29 -0400 Subject: [PATCH 3/3] Remove bump from cluster creation and cleanup --- .ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml | 2 -- .ci/jobs/elastic+helm-charts+staging+cluster-creation.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml b/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml index e4cb2d602..df2daf77d 100644 --- a/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml +++ b/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml @@ -33,8 +33,6 @@ unset VAULT_ROLE_ID VAULT_SECRET_ID set -x - env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py - cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}" cd helpers/terraform/ diff --git a/.ci/jobs/elastic+helm-charts+staging+cluster-creation.yml b/.ci/jobs/elastic+helm-charts+staging+cluster-creation.yml index 00d5f7975..8770a257a 100644 --- a/.ci/jobs/elastic+helm-charts+staging+cluster-creation.yml +++ b/.ci/jobs/elastic+helm-charts+staging+cluster-creation.yml @@ -33,8 +33,6 @@ unset VAULT_ROLE_ID VAULT_SECRET_ID set -x - env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py - cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}" cd helpers/terraform/