From 69a026cff6692a7b378517d0a91ebd4e125bae0a Mon Sep 17 00:00:00 2001 From: Matt Gaunt-Seo Date: Tue, 18 Jul 2023 13:20:48 -0700 Subject: [PATCH 1/2] Update pipedream lib for rollback agent --- gocd/generated-pipelines/rollback-symbolicator.yaml | 2 ++ gocd/templates/jsonnetfile.json | 2 +- gocd/templates/jsonnetfile.lock.json | 4 ++-- gocd/templates/symbolicator.jsonnet | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gocd/generated-pipelines/rollback-symbolicator.yaml b/gocd/generated-pipelines/rollback-symbolicator.yaml index 6f01e73d2..2288dfc98 100644 --- a/gocd/generated-pipelines/rollback-symbolicator.yaml +++ b/gocd/generated-pipelines/rollback-symbolicator.yaml @@ -20,6 +20,7 @@ pipelines: type: manual jobs: rollback: + elastic_profile_id: symbolicator tasks: - script: | ##!/bin/bash @@ -37,6 +38,7 @@ pipelines: start_rollback: jobs: rollback: + elastic_profile_id: symbolicator tasks: - script: | ##!/bin/bash diff --git a/gocd/templates/jsonnetfile.json b/gocd/templates/jsonnetfile.json index 81740f830..e238217b1 100644 --- a/gocd/templates/jsonnetfile.json +++ b/gocd/templates/jsonnetfile.json @@ -8,7 +8,7 @@ "subdir": "libs" } }, - "version": "v1.1.4" + "version": "v1.1.5" } ], "legacyImports": true diff --git a/gocd/templates/jsonnetfile.lock.json b/gocd/templates/jsonnetfile.lock.json index eab352485..d6be4cb6e 100644 --- a/gocd/templates/jsonnetfile.lock.json +++ b/gocd/templates/jsonnetfile.lock.json @@ -8,8 +8,8 @@ "subdir": "libs" } }, - "version": "fc28e0fb504269698df9b19109543057eb5549cd", - "sum": "/R7fdDl7Sg9wqOEoDVkp49qiuMVtzjvAcqVGX4HbGG4=" + "version": "b4a8746700056bb73b844272b998560517604257", + "sum": "Wcf/vHlubUK4+DojSeapVllcwhyustcfj+cMt9DqbWk=" } ], "legacyImports": false diff --git a/gocd/templates/symbolicator.jsonnet b/gocd/templates/symbolicator.jsonnet index 5abea269f..5c4d3b7e7 100644 --- a/gocd/templates/symbolicator.jsonnet +++ b/gocd/templates/symbolicator.jsonnet @@ -19,6 +19,7 @@ local pipedream_config = { rollback: { material_name: 'symbolicator_repo', stage: 'deploy_primary', + elastic_profile_id: 'symbolicator', }, // Set to true to auto-deploy changes (defaults to true) From 81eb26c36efc2837874cbe9ea96a530d386c3367 Mon Sep 17 00:00:00 2001 From: Matt Gaunt-Seo Date: Wed, 19 Jul 2023 15:41:37 -0700 Subject: [PATCH 2/2] Update libs to v1.1.9 --- .../rollback-symbolicator.yaml | 24 ++++--------------- gocd/templates/jsonnetfile.json | 2 +- gocd/templates/jsonnetfile.lock.json | 4 ++-- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/gocd/generated-pipelines/rollback-symbolicator.yaml b/gocd/generated-pipelines/rollback-symbolicator.yaml index 2288dfc98..ca49211ee 100644 --- a/gocd/generated-pipelines/rollback-symbolicator.yaml +++ b/gocd/generated-pipelines/rollback-symbolicator.yaml @@ -3,9 +3,9 @@ pipelines: rollback-symbolicator: display_order: 1 environment_variables: - ALL_PIPELINE_FLAGS: --pipeline="deploy-symbolicator-monitor" --pipeline="deploy-symbolicator-us" --pipeline="deploy-symbolicator" + ALL_PIPELINE_FLAGS: --pipeline=deploy-symbolicator-monitor --pipeline=deploy-symbolicator-us --pipeline=deploy-symbolicator GOCD_ACCESS_TOKEN: '{{SECRET:[devinfra][gocd_access_token]}}' - REGION_PIPELINE_FLAGS: --pipeline="deploy-symbolicator-monitor" --pipeline="deploy-symbolicator-us" + REGION_PIPELINE_FLAGS: --pipeline=deploy-symbolicator-monitor --pipeline=deploy-symbolicator-us ROLLBACK_MATERIAL_NAME: symbolicator_repo ROLLBACK_STAGE: deploy_primary group: symbolicator @@ -35,25 +35,9 @@ pipelines: gocd-pause-and-cancel-pipelines \ --pause-message="This pipeline is being rolled back, please check with team before un-pausing." \ "$@" - start_rollback: + - start_rollback: jobs: rollback: elastic_profile_id: symbolicator tasks: - - script: | - ##!/bin/bash - - ## Note: $REGION_PIPELINE_FLAGS has no quoting, for word expansion - ## shellcheck disable=SC2086 - if [[ "${REGION_PIPELINE_FLAGS:-}" ]]; then - set -- $REGION_PIPELINE_FLAGS - fi - - ## Get sha from the given pipeline run to deploy to all pipedream pipelines. - sha=$(gocd-sha-for-pipeline --material-name="${ROLLBACK_MATERIAL_NAME}") - - gocd-emergency-deploy \ - --commit-sha="${sha}" \ - --deploy-stage="${ROLLBACK_STAGE}" \ - --pause-message="This pipeline was rolled back, please check with team before un-pausing." \ - "$@" + - script: "##!/bin/bash\n\n## Note: $REGION_PIPELINE_FLAGS has no quoting, for word expansion\n## shellcheck disable=SC2086\nif [[ \"${REGION_PIPELINE_FLAGS:-}\" ]]; then\n set -- $REGION_PIPELINE_FLAGS\nfi\n\n## Get sha from the given pipeline run to deploy to all pipedream pipelines.\nsha=$(gocd-sha-for-pipeline --material-name=\"${ROLLBACK_MATERIAL_NAME}\")\n\necho \"\U0001F4D1 Rolling back to sha: ${sha}\"\n\ngocd-emergency-deploy \\\n --material-name=\"${ROLLBACK_MATERIAL_NAME}\" \\\n --commit-sha=\"${sha}\" \\\n --deploy-stage=\"${ROLLBACK_STAGE}\" \\\n --pause-message=\"This pipeline was rolled back, please check with team before un-pausing.\" \\\n \"$@\"\n" diff --git a/gocd/templates/jsonnetfile.json b/gocd/templates/jsonnetfile.json index e238217b1..c06c5d06d 100644 --- a/gocd/templates/jsonnetfile.json +++ b/gocd/templates/jsonnetfile.json @@ -8,7 +8,7 @@ "subdir": "libs" } }, - "version": "v1.1.5" + "version": "v1.1.9" } ], "legacyImports": true diff --git a/gocd/templates/jsonnetfile.lock.json b/gocd/templates/jsonnetfile.lock.json index d6be4cb6e..96d67a827 100644 --- a/gocd/templates/jsonnetfile.lock.json +++ b/gocd/templates/jsonnetfile.lock.json @@ -8,8 +8,8 @@ "subdir": "libs" } }, - "version": "b4a8746700056bb73b844272b998560517604257", - "sum": "Wcf/vHlubUK4+DojSeapVllcwhyustcfj+cMt9DqbWk=" + "version": "398935d57d495803fc5e677b6b8c4d012da33d41", + "sum": "Daqk+eHsSP/IttLc+PlG37AUysHMYZ3VKw1vX+16uO4=" } ], "legacyImports": false