From 84617fe965fd110f0b3968244bea30dab7a032db Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Wed, 9 Jun 2021 11:46:12 -0700
Subject: [PATCH 1/3] first cut at including before/after test steps for
 standard ci.yml

---
 eng/pipelines/templates/jobs/ci.tests.yml              | 10 ++++++++++
 eng/pipelines/templates/jobs/ci.yml                    |  8 ++++++++
 .../templates/stages/archetype-sdk-client.yml          |  8 ++++++++
 3 files changed, 26 insertions(+)

diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml
index 0c4bd3bb34d4..133eafa0025b 100644
--- a/eng/pipelines/templates/jobs/ci.tests.yml
+++ b/eng/pipelines/templates/jobs/ci.tests.yml
@@ -8,6 +8,12 @@ parameters:
   - name: TestMarkArgument
     type: string
     default: ''
+  - name: BeforeTestSteps
+    type: object
+    default: []
+  - name: AfterTestSteps
+    type: object
+    default: []
   - name: BuildTargetingString
     type: string
     default: 'azure-*'
@@ -110,3 +116,7 @@ jobs:
             parameters:
               ServiceDirectory: ${{ parameters.ServiceDirectory }}
               BuildTargetingString: ${{ parameters.BuildTargetingString }}
+          
+          - ${{ each step in parameters.BeforeTestSteps }}:
+            -  ${{ step }}
+        AfterTestSteps: ${{ parameters.AfterTestSteps }}
\ No newline at end of file
diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
index 71d5b0fcb93f..0f008939f29d 100644
--- a/eng/pipelines/templates/jobs/ci.yml
+++ b/eng/pipelines/templates/jobs/ci.yml
@@ -17,6 +17,12 @@ parameters:
   - name: TestMarkArgument
     type: string
     default: ''
+  - name: BeforeTestSteps
+    type: object
+    default: []
+  - name: AfterTestSteps
+    type: object
+    default: []
   - name: BuildTargetingString
     type: string
     default: 'azure-*'
@@ -121,6 +127,8 @@ jobs:
         ServiceDirectory: ${{ parameters.ServiceDirectory }}
         TestPipeline: ${{ parameters.TestPipeline }}
         TestMarkArgument: ${{ parameters.TestMarkArgument }}
+        BeforeTestSteps: ${{ parameters.BeforeTestSteps }}
+        AfterTestSteps: ${{ parameters.AfterTestSteps }}
         BuildTargetingString: ${{ parameters.BuildTargetingString }}
         TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
         ToxEnvParallel: ${{ parameters.ToxEnvParallel }}
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
index 0f3ffcf9f0f6..3c28d3ba5426 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -11,6 +11,12 @@ parameters:
 - name: TestPipeline
   type: boolean
   default: false
+- name: BeforeTestSteps
+  type: object
+  default: []
+- name: AfterTestSteps
+  type: object
+  default: []
 - name: BeforePublishSteps
   type: object
   default: []
@@ -74,6 +80,8 @@ stages:
         CondaArtifacts: ${{ parameters.CondaArtifacts }}
         ${{ if eq(parameters.ServiceDirectory, 'template') }}:
           TestPipeline: true
+        BeforeTestSteps: ${{ parameters.BeforeTestSteps }}
+        AfterTestSteps: ${{ parameters.AfterTestSteps }}
         BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
         TestMarkArgument: ${{ parameters.TestMarkArgument }}
         BuildTargetingString: $(BuildTargetingStringValue)

From 28a2944a924bf3119b9dd8ba7ed3bd6b3b6c25b4 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Wed, 9 Jun 2021 11:49:19 -0700
Subject: [PATCH 2/3] add beforeteststep to appconfiguration for testing

---
 sdk/appconfiguration/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sdk/appconfiguration/ci.yml b/sdk/appconfiguration/ci.yml
index e48617d689db..d5e54bd4172b 100644
--- a/sdk/appconfiguration/ci.yml
+++ b/sdk/appconfiguration/ci.yml
@@ -32,6 +32,10 @@ extends:
   parameters:
     ServiceDirectory: appconfiguration
     VerifyAutorest: true
+    BeforeTestSteps: 
+      - pwsh:
+          Write-Host "I am here. I am alive."
+        displayName: Test Insertion of BeforeTest Step
     Artifacts:
     - name: azure-appconfiguration
       safeName: azureappconfiguration

From 85c1c71b28d788830b24c74d351dece5fabf7e57 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Wed, 9 Jun 2021 12:01:59 -0700
Subject: [PATCH 3/3] add trailing whitespace. undo appconfiguration changes.

---
 eng/pipelines/templates/jobs/ci.tests.yml | 2 +-
 sdk/appconfiguration/ci.yml               | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml
index 133eafa0025b..c2fe523211cf 100644
--- a/eng/pipelines/templates/jobs/ci.tests.yml
+++ b/eng/pipelines/templates/jobs/ci.tests.yml
@@ -119,4 +119,4 @@ jobs:
           
           - ${{ each step in parameters.BeforeTestSteps }}:
             -  ${{ step }}
-        AfterTestSteps: ${{ parameters.AfterTestSteps }}
\ No newline at end of file
+        AfterTestSteps: ${{ parameters.AfterTestSteps }}
diff --git a/sdk/appconfiguration/ci.yml b/sdk/appconfiguration/ci.yml
index d5e54bd4172b..e48617d689db 100644
--- a/sdk/appconfiguration/ci.yml
+++ b/sdk/appconfiguration/ci.yml
@@ -32,10 +32,6 @@ extends:
   parameters:
     ServiceDirectory: appconfiguration
     VerifyAutorest: true
-    BeforeTestSteps: 
-      - pwsh:
-          Write-Host "I am here. I am alive."
-        displayName: Test Insertion of BeforeTest Step
     Artifacts:
     - name: azure-appconfiguration
       safeName: azureappconfiguration