From cd28b5535df7b730fd04c616c5b271bf66666b58 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com>
Date: Mon, 10 Aug 2020 10:23:12 -0700
Subject: [PATCH 1/3] Remove additional matrix

---
 eng/pipelines/templates/jobs/archetype-sdk-client.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 7afbc5495394..86a8f6e28856 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -100,11 +100,6 @@ jobs:
               ${{ matrixEntry.key }}:
                 ${{ insert }}: ${{ matrixEntry.value }}
 
-        ${{ each matrixEntry in parameters.AdditionalTestMatrix }}:
-          ${{ if or(eq(matrixEntry.value.RunForPR, 'true'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-            ${{ matrixEntry.key }}:
-              ${{ insert }}: ${{ matrixEntry.value }}
-
         
     pool:
       vmImage: '$(OSVmImage)'

From ebc04acd87aedc60b252f6eed87d26bee92acce3 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com>
Date: Mon, 10 Aug 2020 11:04:01 -0700
Subject: [PATCH 2/3] Revert skipping pypy3

---
 eng/pipelines/templates/jobs/archetype-sdk-client.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 86a8f6e28856..9466e9712c30 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -95,10 +95,13 @@ jobs:
       matrix:
         ${{ each matrixEntry in parameters.TestMatrix }}:
           ${{ if or(eq(matrixEntry.value.RunForPR, 'true'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-            # Skip python version if any specific service has opted out
-            ${{ if ne(parameters.SkipPythonVersion, matrixEntry.value.PythonVersion) }}:
-              ${{ matrixEntry.key }}:
-                ${{ insert }}: ${{ matrixEntry.value }}
+            ${{ matrixEntry.key }}:
+              ${{ insert }}: ${{ matrixEntry.value }}
+
+        ${{ each matrixEntry in parameters.AdditionalTestMatrix }}:
+          ${{ if or(eq(matrixEntry.value.RunForPR, 'true'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+            ${{ matrixEntry.key }}:
+              ${{ insert }}: ${{ matrixEntry.value }}
 
         
     pool:

From 7f41f42cb771dae0289b62dc4739365cd741208e Mon Sep 17 00:00:00 2001
From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com>
Date: Mon, 10 Aug 2020 11:08:28 -0700
Subject: [PATCH 3/3] Fix YAML indentation

---
 eng/pipelines/templates/jobs/archetype-sdk-client.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 9466e9712c30..547275bf447b 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -39,7 +39,7 @@ parameters:
       PythonVersion: 'pypy3'
       CoverageArg: '--disablecov'
       RunForPR: false
-    AdditionalTestMatrix: []
+  AdditionalTestMatrix: []
 
 jobs:
   - job: 'Build'
@@ -95,8 +95,10 @@ jobs:
       matrix:
         ${{ each matrixEntry in parameters.TestMatrix }}:
           ${{ if or(eq(matrixEntry.value.RunForPR, 'true'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-            ${{ matrixEntry.key }}:
-              ${{ insert }}: ${{ matrixEntry.value }}
+            # Skip python version if any specific service has opted out
+            ${{ if ne(parameters.SkipPythonVersion, matrixEntry.value.PythonVersion) }}:
+              ${{ matrixEntry.key }}:
+                ${{ insert }}: ${{ matrixEntry.value }}
 
         ${{ each matrixEntry in parameters.AdditionalTestMatrix }}:
           ${{ if or(eq(matrixEntry.value.RunForPR, 'true'), ne(variables['Build.Reason'], 'PullRequest')) }}: