From 64e8d8e66304e8c50aa16a860c3266654d9d233f Mon Sep 17 00:00:00 2001 From: sarahpeiffer Date: Fri, 8 Oct 2021 14:48:54 -0700 Subject: [PATCH 1/2] use buildcommand for prod pipeline --- ...user.linux.official.all_tag.all_phase.all_config.ci_prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml b/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml index 61785f38d..97390298c 100644 --- a/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml +++ b/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml @@ -24,7 +24,7 @@ restore: build: commands: - - !!defaultcommand + - !!buildcommand name: 'Build Docker Provider Shell Bundle' command: '.pipelines/build-linux.sh' fail_on_stderr: false From 3d51603a216f02e1a7f19b1da8b51d272e1b82cf Mon Sep 17 00:00:00 2001 From: sarahpeiffer Date: Mon, 1 Nov 2021 17:00:05 -0700 Subject: [PATCH 2/2] remove download of cdpx creds --- .pipelines/get-aad-app-creds-from-kv.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.pipelines/get-aad-app-creds-from-kv.sh b/.pipelines/get-aad-app-creds-from-kv.sh index a0ba464cc..8ef56cddb 100755 --- a/.pipelines/get-aad-app-creds-from-kv.sh +++ b/.pipelines/get-aad-app-creds-from-kv.sh @@ -11,8 +11,6 @@ do KV) KV=$VALUE ;; KVSECRETNAMEAPPID) AppId=$VALUE ;; KVSECRETNAMEAPPSECRET) AppSecret=$VALUE ;; - KVSECRETNAMECDPXAPPID) CdpxAppId=$VALUE ;; - KVSECRETNAMECDPXAPPSECRET) CdpxAppSecret=$VALUE ;; *) esac done @@ -29,16 +27,4 @@ az keyvault secret download --file ~/acrappsecret --vault-name ${KV} --name ${A echo "downloaded the appsecret from KV:${KV} and KV secret:${AppSecret}" -echo "key vault secret name for cdpx appid:${KVSECRETNAMECDPXAPPID}" - -echo "key vault secret name for cdpx appsecret:${KVSECRETNAMECDPXAPPSECRET}" - -az keyvault secret download --file ~/cdpxacrappid --vault-name ${KV} --name ${CdpxAppId} - -echo "downloaded the appid from KV:${KV} and KV secret:${CdpxAppId}" - -az keyvault secret download --file ~/cdpxacrappsecret --vault-name ${KV} --name ${CdpxAppSecret} - -echo "downloaded the appsecret from KV:${KV} and KV secret:${CdpxAppSecret}" - echo "end: get app id and secret from specified key vault"