From 46e9c46aa4d8b090fd6df1d15ca0c33333f5e6ee Mon Sep 17 00:00:00 2001
From: sarahpeiffer <speiffer@wustl.edu>
Date: Wed, 6 Oct 2021 14:37:55 -0700
Subject: [PATCH 1/3] don't use cdpx acr creds from kv

---
 .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"

From 296b0c7331dbaed9598bd2e6cdbf4f271674a1b3 Mon Sep 17 00:00:00 2001
From: sarahpeiffer <speiffer@wustl.edu>
Date: Wed, 6 Oct 2021 15:30:19 -0700
Subject: [PATCH 2/3] add e2etest.yaml to build output

---
 ...er.linux.official.all_tag.all_phase.all_config.ci_prod.yml | 4 ++++
 .pipelines/pipeline.user.linux.yml                            | 4 ++++
 2 files changed, 8 insertions(+)

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 a199bd860..61785f38d 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
@@ -45,6 +45,10 @@ build:
           to: 'build'
           include:
             - '**'
+        - from: 'test/e2e'
+          to: 'build'
+          include:
+            - '*.yaml'
 
 package:
   commands:
diff --git a/.pipelines/pipeline.user.linux.yml b/.pipelines/pipeline.user.linux.yml
index 60c1f7640..4c39fad5a 100644
--- a/.pipelines/pipeline.user.linux.yml
+++ b/.pipelines/pipeline.user.linux.yml
@@ -45,6 +45,10 @@ build:
           to: 'build'
           include:
             - '**'
+        - from: 'test/e2e'
+          to: 'build'
+          include:
+            - '*.yaml'
 
 package:
   commands:

From 7aa51e6cebf59c68982317242624790466660867 Mon Sep 17 00:00:00 2001
From: sarahpeiffer <speiffer@wustl.edu>
Date: Wed, 6 Oct 2021 15:50:20 -0700
Subject: [PATCH 3/3] keep cdpx creds for now

---
 .pipelines/get-aad-app-creds-from-kv.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.pipelines/get-aad-app-creds-from-kv.sh b/.pipelines/get-aad-app-creds-from-kv.sh
index 8ef56cddb..a0ba464cc 100755
--- a/.pipelines/get-aad-app-creds-from-kv.sh
+++ b/.pipelines/get-aad-app-creds-from-kv.sh
@@ -11,6 +11,8 @@ do
            KV) KV=$VALUE ;;
            KVSECRETNAMEAPPID) AppId=$VALUE ;;
            KVSECRETNAMEAPPSECRET) AppSecret=$VALUE ;;
+           KVSECRETNAMECDPXAPPID) CdpxAppId=$VALUE ;;
+           KVSECRETNAMECDPXAPPSECRET) CdpxAppSecret=$VALUE ;;
            *)
     esac
 done
@@ -27,4 +29,16 @@ 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"