From be4089c99b26fb55a5787bf9ad8c6650e1957cfe Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Thu, 8 Sep 2022 12:09:13 -0700
Subject: [PATCH 01/23] test1

---
 eng/pipelines/templates/jobs/perf.yml | 51 +++++++++++++++++++++++++++
 sdk/core/perf-resources.bicep         | 36 +++++++++++++++++++
 sdk/core/perf.yml                     | 32 +++++++++++++++++
 3 files changed, 119 insertions(+)
 create mode 100644 eng/pipelines/templates/jobs/perf.yml
 create mode 100644 sdk/core/perf-resources.bicep
 create mode 100644 sdk/core/perf.yml

diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml
new file mode 100644
index 0000000000..76cb23ec1e
--- /dev/null
+++ b/eng/pipelines/templates/jobs/perf.yml
@@ -0,0 +1,51 @@
+parameters:
+- name: ServiceDirectory
+  type: string
+  default: ''
+- name: services
+  type: string
+  default: ''
+- name: PackageVersions
+  type: string
+  default: '.*'
+- name: Tests
+  type: string
+  default: '.*'
+- name: Arguments
+  type: string
+  default: '.*' 
+- name: Iterations
+  type: number
+  default: '5'
+- name: AdditionalArguments
+  type: string
+  default: ''
+- name: EnvVars
+  type: object
+  default: {}
+
+extends:
+  template: /eng/common/pipelines/templates/jobs/perf.yml
+  parameters:
+    Variables:
+    - template: /eng/pipelines/templates/variables/globals.yml
+    Language: Java
+    InstallLanguageSteps:
+    - task: JavaToolInstaller@0
+      inputs:
+        versionSpec: '8'
+        jdkArchitectureOption: 'x64'
+        jdkSourceOption: 'PreInstalled'
+      displayName: Install Java 8
+    - script: |
+        java -version
+        mvn --version
+      displayName: Print Java Versions
+    ServiceDirectory: ${{ parameters.ServiceDirectory }}
+    Services: ${{ parameters.Services }}
+    PackageVersions: ${{ parameters.PackageVersions }}
+    Tests: ${{ parameters.Tests }}
+    Arguments: ${{ parameters.Arguments }}
+    Iterations: ${{ parameters.Iterations }}
+    AdditionalArguments: ${{ parameters.AdditionalArguments }}
+    EnvVars: ${{ parameters.EnvVars}}
diff --git a/sdk/core/perf-resources.bicep b/sdk/core/perf-resources.bicep
new file mode 100644
index 0000000000..39c18da60a
--- /dev/null
+++ b/sdk/core/perf-resources.bicep
@@ -0,0 +1,36 @@
+param baseName string = resourceGroup().name
+param location string = resourceGroup().location
+
+resource storageAccount 'Microsoft.Storage/storageAccounts@2019-06-01' = {
+  name: '${baseName}blob'
+  location: location
+  kind: 'BlockBlobStorage'
+  sku: {
+    name: 'Premium_LRS'
+  }
+}
+
+resource storageAccountBlobServices 'Microsoft.Storage/storageAccounts/blobServices@2021-09-01' = {
+  name: 'default'
+  parent: storageAccount
+}
+
+resource testContainer 'Microsoft.Storage/storageAccounts/blobServices/containers@2021-09-01' = {
+  name: 'testcontainer'
+  parent: storageAccountBlobServices
+}
+
+param now string = utcNow()
+param expiryDate string = dateTimeAdd(now, 'P14D')
+param accountSasProperties object = {
+  signedServices: 'b'
+  signedPermission: 'rw'
+  signedExpiry: expiryDate
+  signedResourceTypes: 'sco'
+}
+
+var sasToken = storageAccount.listAccountSas('2021-09-01', accountSasProperties).accountSasToken
+
+var containerUrl = '${storageAccount.properties.primaryEndpoints.blob}${testContainer.name}?${sasToken}'
+
+output AZURE_STORAGE_CONTAINER_SAS_URL string = containerUrl
diff --git a/sdk/core/perf.yml b/sdk/core/perf.yml
new file mode 100644
index 0000000000..b62e5ec656
--- /dev/null
+++ b/sdk/core/perf.yml
@@ -0,0 +1,32 @@
+parameters:
+- name: PackageVersions
+  displayName: PackageVersions (regex of package versions to run)
+  type: string
+  default: '1|source'
+- name: Tests
+  displayName: Tests (regex of tests to run)
+  type: string
+  default: '^(jsonsend)|(jsonreceive)|(xmlsend)|(xmlreceive)|(binarydatasend)|(binarydatareceive)$'
+- name: Arguments
+  displayName: Arguments (regex of arguments to run)
+  type: string
+  default: '.*'
+- name: Iterations
+  displayName: Iterations (times to run each test)
+  type: number
+  default: '5'
+- name: AdditionalArguments
+  displayName: AdditionalArguments (passed to PerfAutomation)
+  type: string
+  default: ' '
+
+extends:
+  template: /eng/pipelines/templates/jobs/perf.yml
+  parameters:
+    ServiceDirectory: core
+    Services: "^core$"
+    PackageVersions: ${{ parameters.PackageVersions }}
+    Tests: ${{ parameters.Tests }}
+    Arguments: ${{ parameters.Arguments }}
+    Iterations: ${{ parameters.Iterations }}
+    AdditionalArguments: ${{ parameters.AdditionalArguments }}

From d38a6cb06a5baf8b6619d23cefa6bffc17bf0ca7 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Thu, 8 Sep 2022 12:14:09 -0700
Subject: [PATCH 02/23] glob

---
 eng/pipelines/templates/variables/globals.yml | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 eng/pipelines/templates/variables/globals.yml

diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml
new file mode 100644
index 0000000000..e9194ca5a2
--- /dev/null
+++ b/eng/pipelines/templates/variables/globals.yml
@@ -0,0 +1,42 @@
+variables:
+  DocWardenVersion: '0.7.2'
+  # This is the default Java build version. It's the version used to build the shipping libraries, Spotbugs etc.
+  JavaBuildVersion: '1.17'
+  # This is the default Java test version. It's the version used when running tests.
+  JavaTestVersion: '1.17'
+
+  # True if 'Enable system diagnostics' is checked when running a pipeline manually
+  IsDebug: $[coalesce(variables['System.Debug'], 'false')]
+
+  # Sets the Maven log level to either the LogLevel passed in the manual pipeline run or the default 'warn'
+  MavenLogLevel: $[coalesce(variables['LogLevel'], 'warn')]
+
+  # Maven build/test options
+  MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
+  # See https://github.com/actions/virtual-environments/issues/1499 for more info about the wagon options
+  # If reports about Maven dependency downloads become more common investigate re-introducing "-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false", or other iterations of the configurations.
+  WagonOptions: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60'
+  DefaultOptions: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) --batch-mode --fail-at-end --settings eng/settings.xml $(WagonOptions)'
+  LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=$(MavenLogLevel) -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+  MemoryOptions: '-Xmx3072m'
+  DefaultSkipOptions: '-Dgpg.skip -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -DtrimStackTrace=false'
+  DefaultTestOptions: '$(DefaultOptions) $(DefaultSkipOptions) -pl $(ProjectList)'
+  DefaultTestMavenOptions: '$(MemoryOptions) $(LoggingOptions)'
+  AdditionalOptions: ''
+
+  # Exists if needed in coalesce situations.
+  DefaultTestGoals: 'surefire:test'
+  # This will be overwritten by the test matrix, if configured.
+  TestGoals: $(DefaultTestGoals)
+
+  # This will be overwritten by the test matrix, if configured.
+  TestOptions: ''
+  # TestFromSource is one of the cache keys but isn't set until the test matrix
+  # has been processed. Without a default value it'll be treated as a string literal
+  # "$(TestFromSource)" instead of true/false. It'll be overwritten when the test
+  # matrix has been processed
+  TestFromSource: false
+
+  skipComponentGovernanceDetection: true
+  DisableDockerDetector: true
+  Package.EnableSBOMSigning: true

From 7e884dfa0251dba2f0d59b6ad4f18fafa392b692 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Thu, 8 Sep 2022 12:26:50 -0700
Subject: [PATCH 03/23] quick cleanup

---
 eng/pipelines/templates/jobs/perf.yml         | 13 +-----------
 eng/pipelines/templates/variables/globals.yml | 20 -------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml
index 76cb23ec1e..6368be6a20 100644
--- a/eng/pipelines/templates/jobs/perf.yml
+++ b/eng/pipelines/templates/jobs/perf.yml
@@ -29,18 +29,7 @@ extends:
   parameters:
     Variables:
     - template: /eng/pipelines/templates/variables/globals.yml
-    Language: Java
-    InstallLanguageSteps:
-    - task: JavaToolInstaller@0
-      inputs:
-        versionSpec: '8'
-        jdkArchitectureOption: 'x64'
-        jdkSourceOption: 'PreInstalled'
-      displayName: Install Java 8
-    - script: |
-        java -version
-        mvn --version
-      displayName: Print Java Versions
+    Language: CPP
     ServiceDirectory: ${{ parameters.ServiceDirectory }}
     Services: ${{ parameters.Services }}
     PackageVersions: ${{ parameters.PackageVersions }}
diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml
index e9194ca5a2..b782b88239 100644
--- a/eng/pipelines/templates/variables/globals.yml
+++ b/eng/pipelines/templates/variables/globals.yml
@@ -1,27 +1,7 @@
 variables:
-  DocWardenVersion: '0.7.2'
-  # This is the default Java build version. It's the version used to build the shipping libraries, Spotbugs etc.
-  JavaBuildVersion: '1.17'
-  # This is the default Java test version. It's the version used when running tests.
-  JavaTestVersion: '1.17'
-
   # True if 'Enable system diagnostics' is checked when running a pipeline manually
   IsDebug: $[coalesce(variables['System.Debug'], 'false')]
 
-  # Sets the Maven log level to either the LogLevel passed in the manual pipeline run or the default 'warn'
-  MavenLogLevel: $[coalesce(variables['LogLevel'], 'warn')]
-
-  # Maven build/test options
-  MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
-  # See https://github.com/actions/virtual-environments/issues/1499 for more info about the wagon options
-  # If reports about Maven dependency downloads become more common investigate re-introducing "-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false", or other iterations of the configurations.
-  WagonOptions: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60'
-  DefaultOptions: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) --batch-mode --fail-at-end --settings eng/settings.xml $(WagonOptions)'
-  LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=$(MavenLogLevel) -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-  MemoryOptions: '-Xmx3072m'
-  DefaultSkipOptions: '-Dgpg.skip -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -DtrimStackTrace=false'
-  DefaultTestOptions: '$(DefaultOptions) $(DefaultSkipOptions) -pl $(ProjectList)'
-  DefaultTestMavenOptions: '$(MemoryOptions) $(LoggingOptions)'
   AdditionalOptions: ''
 
   # Exists if needed in coalesce situations.

From cd2c7d76eaaddf4c0aeb993ac616a09bd2c52fe5 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Fri, 9 Sep 2022 12:00:44 -0700
Subject: [PATCH 04/23] ddasda

---
 eng/common/TestResources/setup-environments.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/common/TestResources/setup-environments.yml b/eng/common/TestResources/setup-environments.yml
index a829b8dadf..4d4a3eb1b0 100644
--- a/eng/common/TestResources/setup-environments.yml
+++ b/eng/common/TestResources/setup-environments.yml
@@ -28,7 +28,7 @@ steps:
       script: |
         eng/common/scripts/Import-AzModules.ps1
 
-        $environmentSpec = @"
-          $(env-config-dogfood)
-        "@ | ConvertFrom-Json -AsHashtable;
-        Add-AzEnvironment @environmentSpec
+        #$environmentSpec = @"
+        #  $(env-config-dogfood)
+        #"@ | ConvertFrom-Json -AsHashtable;
+        #Add-AzEnvironment @environmentSpec

From 6d9e385284ba37736fb5bc41e56065943abd7937 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Fri, 9 Sep 2022 12:24:46 -0700
Subject: [PATCH 05/23] ddsa

---
 eng/common/pipelines/templates/jobs/perf.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml
index ecd794a1f6..4fcfaba55d 100644
--- a/eng/common/pipelines/templates/jobs/perf.yml
+++ b/eng/common/pipelines/templates/jobs/perf.yml
@@ -104,11 +104,11 @@ jobs:
 
   - ${{ parameters.InstallLanguageSteps }}
 
-  - template: /eng/common/TestResources/deploy-test-resources.yml
-    parameters:
-      ServiceDirectory: ${{ parameters.ServiceDirectory }}
-      Location: westus
-      ResourceType: perf
+  #- template: /eng/common/TestResources/deploy-test-resources.yml
+  #  parameters:
+  #    ServiceDirectory: ${{ parameters.ServiceDirectory }}
+  #    Location: westus
+  #    ResourceType: perf
 
   - pwsh: |
       set-content -path config.yml -value "WorkingDirectories:"

From 9b7b080d967189f6efc361b879e49c2380ee6b1e Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:47:55 -0700
Subject: [PATCH 06/23] envs

---
 eng/pipelines/templates/jobs/perf.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml
index 6368be6a20..c6ce8d8449 100644
--- a/eng/pipelines/templates/jobs/perf.yml
+++ b/eng/pipelines/templates/jobs/perf.yml
@@ -22,7 +22,12 @@ parameters:
   default: ''
 - name: EnvVars
   type: object
-  default: {}
+  default: {
+      {key: VCPKG_ROOT,
+       value: "/home/user/vcpkg"},
+      {key: VCPKG_DEFAULT_TRIPLET,
+       value: x64-linux}
+  }
 
 extends:
   template: /eng/common/pipelines/templates/jobs/perf.yml

From c7341037f21446fc2de8f358985262b822d72075 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:51:31 -0700
Subject: [PATCH 07/23] dsds

---
 eng/pipelines/templates/jobs/perf.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml
index c6ce8d8449..6ea16a816b 100644
--- a/eng/pipelines/templates/jobs/perf.yml
+++ b/eng/pipelines/templates/jobs/perf.yml
@@ -22,12 +22,12 @@ parameters:
   default: ''
 - name: EnvVars
   type: object
-  default: {
+  default: [
       {key: VCPKG_ROOT,
        value: "/home/user/vcpkg"},
       {key: VCPKG_DEFAULT_TRIPLET,
        value: x64-linux}
-  }
+  ]
 
 extends:
   template: /eng/common/pipelines/templates/jobs/perf.yml

From 2c7eb49b59f717b359bc58cf34fb1b6220464368 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:10:12 -0700
Subject: [PATCH 08/23] Revert "ddsa"

This reverts commit 6d9e385284ba37736fb5bc41e56065943abd7937.
---
 eng/common/pipelines/templates/jobs/perf.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml
index 4fcfaba55d..ecd794a1f6 100644
--- a/eng/common/pipelines/templates/jobs/perf.yml
+++ b/eng/common/pipelines/templates/jobs/perf.yml
@@ -104,11 +104,11 @@ jobs:
 
   - ${{ parameters.InstallLanguageSteps }}
 
-  #- template: /eng/common/TestResources/deploy-test-resources.yml
-  #  parameters:
-  #    ServiceDirectory: ${{ parameters.ServiceDirectory }}
-  #    Location: westus
-  #    ResourceType: perf
+  - template: /eng/common/TestResources/deploy-test-resources.yml
+    parameters:
+      ServiceDirectory: ${{ parameters.ServiceDirectory }}
+      Location: westus
+      ResourceType: perf
 
   - pwsh: |
       set-content -path config.yml -value "WorkingDirectories:"

From d4365d1ac875b6f6497156becd5b444f46c86710 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:32:53 -0700
Subject: [PATCH 09/23] wq

---
 eng/common/TestResources/setup-environments.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/common/TestResources/setup-environments.yml b/eng/common/TestResources/setup-environments.yml
index 4d4a3eb1b0..a829b8dadf 100644
--- a/eng/common/TestResources/setup-environments.yml
+++ b/eng/common/TestResources/setup-environments.yml
@@ -28,7 +28,7 @@ steps:
       script: |
         eng/common/scripts/Import-AzModules.ps1
 
-        #$environmentSpec = @"
-        #  $(env-config-dogfood)
-        #"@ | ConvertFrom-Json -AsHashtable;
-        #Add-AzEnvironment @environmentSpec
+        $environmentSpec = @"
+          $(env-config-dogfood)
+        "@ | ConvertFrom-Json -AsHashtable;
+        Add-AzEnvironment @environmentSpec

From cc0e9b4e6cc464fb23eb0ca8baa06c8f0289920a Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:34:54 -0700
Subject: [PATCH 10/23] comment out issues

---
 eng/common/TestResources/setup-environments.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/common/TestResources/setup-environments.yml b/eng/common/TestResources/setup-environments.yml
index a829b8dadf..4d4a3eb1b0 100644
--- a/eng/common/TestResources/setup-environments.yml
+++ b/eng/common/TestResources/setup-environments.yml
@@ -28,7 +28,7 @@ steps:
       script: |
         eng/common/scripts/Import-AzModules.ps1
 
-        $environmentSpec = @"
-          $(env-config-dogfood)
-        "@ | ConvertFrom-Json -AsHashtable;
-        Add-AzEnvironment @environmentSpec
+        #$environmentSpec = @"
+        #  $(env-config-dogfood)
+        #"@ | ConvertFrom-Json -AsHashtable;
+        #Add-AzEnvironment @environmentSpec

From b55e4d53631633b8c18e5ef20407027d67b9b1dd Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:35:59 -0700
Subject: [PATCH 11/23] valid test

---
 sdk/core/perf.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/core/perf.yml b/sdk/core/perf.yml
index b62e5ec656..6e86bb7046 100644
--- a/sdk/core/perf.yml
+++ b/sdk/core/perf.yml
@@ -6,7 +6,7 @@ parameters:
 - name: Tests
   displayName: Tests (regex of tests to run)
   type: string
-  default: '^(jsonsend)|(jsonreceive)|(xmlsend)|(xmlreceive)|(binarydatasend)|(binarydatareceive)$'
+  default: '^(delay)|(jsonreceive)|(xmlsend)|(xmlreceive)|(binarydatasend)|(binarydatareceive)$'
 - name: Arguments
   displayName: Arguments (regex of arguments to run)
   type: string

From ba07b0507cad61cb6a5c38b35121a7da22b55f29 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:40:38 -0700
Subject: [PATCH 12/23] maybe

---
 eng/common/pipelines/templates/jobs/perf.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml
index ecd794a1f6..beb5487624 100644
--- a/eng/common/pipelines/templates/jobs/perf.yml
+++ b/eng/common/pipelines/templates/jobs/perf.yml
@@ -104,11 +104,11 @@ jobs:
 
   - ${{ parameters.InstallLanguageSteps }}
 
-  - template: /eng/common/TestResources/deploy-test-resources.yml
-    parameters:
-      ServiceDirectory: ${{ parameters.ServiceDirectory }}
-      Location: westus
-      ResourceType: perf
+#  - template: /eng/common/TestResources/deploy-test-resources.yml
+#    parameters:
+#      ServiceDirectory: ${{ parameters.ServiceDirectory }}
+#      Location: westus
+#      ResourceType: perf
 
   - pwsh: |
       set-content -path config.yml -value "WorkingDirectories:"

From 947f9d6b2cd2e34ecc34fe1284105f944de9ae97 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:17:01 -0700
Subject: [PATCH 13/23] qwewqewq

---
 eng/common/pipelines/templates/jobs/perf.yml | 10 +++---
 eng/pipelines/templates/jobs/perf.yml        |  7 +---
 sdk/core/perf-resources.bicep                | 36 --------------------
 sdk/core/perf.yml                            |  2 +-
 4 files changed, 7 insertions(+), 48 deletions(-)
 delete mode 100644 sdk/core/perf-resources.bicep

diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml
index beb5487624..ecd794a1f6 100644
--- a/eng/common/pipelines/templates/jobs/perf.yml
+++ b/eng/common/pipelines/templates/jobs/perf.yml
@@ -104,11 +104,11 @@ jobs:
 
   - ${{ parameters.InstallLanguageSteps }}
 
-#  - template: /eng/common/TestResources/deploy-test-resources.yml
-#    parameters:
-#      ServiceDirectory: ${{ parameters.ServiceDirectory }}
-#      Location: westus
-#      ResourceType: perf
+  - template: /eng/common/TestResources/deploy-test-resources.yml
+    parameters:
+      ServiceDirectory: ${{ parameters.ServiceDirectory }}
+      Location: westus
+      ResourceType: perf
 
   - pwsh: |
       set-content -path config.yml -value "WorkingDirectories:"
diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml
index 6ea16a816b..39439cfd6a 100644
--- a/eng/pipelines/templates/jobs/perf.yml
+++ b/eng/pipelines/templates/jobs/perf.yml
@@ -22,12 +22,7 @@ parameters:
   default: ''
 - name: EnvVars
   type: object
-  default: [
-      {key: VCPKG_ROOT,
-       value: "/home/user/vcpkg"},
-      {key: VCPKG_DEFAULT_TRIPLET,
-       value: x64-linux}
-  ]
+  default: []
 
 extends:
   template: /eng/common/pipelines/templates/jobs/perf.yml
diff --git a/sdk/core/perf-resources.bicep b/sdk/core/perf-resources.bicep
deleted file mode 100644
index 39c18da60a..0000000000
--- a/sdk/core/perf-resources.bicep
+++ /dev/null
@@ -1,36 +0,0 @@
-param baseName string = resourceGroup().name
-param location string = resourceGroup().location
-
-resource storageAccount 'Microsoft.Storage/storageAccounts@2019-06-01' = {
-  name: '${baseName}blob'
-  location: location
-  kind: 'BlockBlobStorage'
-  sku: {
-    name: 'Premium_LRS'
-  }
-}
-
-resource storageAccountBlobServices 'Microsoft.Storage/storageAccounts/blobServices@2021-09-01' = {
-  name: 'default'
-  parent: storageAccount
-}
-
-resource testContainer 'Microsoft.Storage/storageAccounts/blobServices/containers@2021-09-01' = {
-  name: 'testcontainer'
-  parent: storageAccountBlobServices
-}
-
-param now string = utcNow()
-param expiryDate string = dateTimeAdd(now, 'P14D')
-param accountSasProperties object = {
-  signedServices: 'b'
-  signedPermission: 'rw'
-  signedExpiry: expiryDate
-  signedResourceTypes: 'sco'
-}
-
-var sasToken = storageAccount.listAccountSas('2021-09-01', accountSasProperties).accountSasToken
-
-var containerUrl = '${storageAccount.properties.primaryEndpoints.blob}${testContainer.name}?${sasToken}'
-
-output AZURE_STORAGE_CONTAINER_SAS_URL string = containerUrl
diff --git a/sdk/core/perf.yml b/sdk/core/perf.yml
index 6e86bb7046..4cc953cf3e 100644
--- a/sdk/core/perf.yml
+++ b/sdk/core/perf.yml
@@ -6,7 +6,7 @@ parameters:
 - name: Tests
   displayName: Tests (regex of tests to run)
   type: string
-  default: '^(delay)|(jsonreceive)|(xmlsend)|(xmlreceive)|(binarydatasend)|(binarydatareceive)$'
+  default: '^(extendedOptions)$'
 - name: Arguments
   displayName: Arguments (regex of arguments to run)
   type: string

From 68629745c2c018a6b4ba8afa1a9a9dd98f0e1340 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:38:29 -0700
Subject: [PATCH 14/23] lang steps

---
 sdk/core/perf.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sdk/core/perf.yml b/sdk/core/perf.yml
index 4cc953cf3e..afd742fbaf 100644
--- a/sdk/core/perf.yml
+++ b/sdk/core/perf.yml
@@ -30,3 +30,6 @@ extends:
     Arguments: ${{ parameters.Arguments }}
     Iterations: ${{ parameters.Iterations }}
     AdditionalArguments: ${{ parameters.AdditionalArguments }}
+    InstallLanguageSteps:
+      - template: /eng/pipelines/templates/steps/vcpkg-clone.yml
+      - template: /eng/pipelines/templates/steps/vcpkg.yml
\ No newline at end of file

From e73f691d2746095fb6480df23be8d53c44d214f3 Mon Sep 17 00:00:00 2001
From: Daniel Jurek <djurek@microsoft.com>
Date: Thu, 15 Sep 2022 13:42:05 -0700
Subject: [PATCH 15/23] Vcpkg pre-steps in the place Daniel should've recommend
 they go

---
 eng/pipelines/templates/jobs/perf.yml | 3 +++
 sdk/core/perf.yml                     | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml
index 39439cfd6a..e8de918da0 100644
--- a/eng/pipelines/templates/jobs/perf.yml
+++ b/eng/pipelines/templates/jobs/perf.yml
@@ -38,3 +38,6 @@ extends:
     Iterations: ${{ parameters.Iterations }}
     AdditionalArguments: ${{ parameters.AdditionalArguments }}
     EnvVars: ${{ parameters.EnvVars}}
+    InstallLanguageSteps:
+      - template: /eng/pipelines/templates/steps/vcpkg-clone.yml
+      - template: /eng/pipelines/templates/steps/vcpkg.yml
\ No newline at end of file
diff --git a/sdk/core/perf.yml b/sdk/core/perf.yml
index afd742fbaf..4cc953cf3e 100644
--- a/sdk/core/perf.yml
+++ b/sdk/core/perf.yml
@@ -30,6 +30,3 @@ extends:
     Arguments: ${{ parameters.Arguments }}
     Iterations: ${{ parameters.Iterations }}
     AdditionalArguments: ${{ parameters.AdditionalArguments }}
-    InstallLanguageSteps:
-      - template: /eng/pipelines/templates/steps/vcpkg-clone.yml
-      - template: /eng/pipelines/templates/steps/vcpkg.yml
\ No newline at end of file

From cc453502b7a6095d44aaf01166abbf3ee7daff15 Mon Sep 17 00:00:00 2001
From: Daniel Jurek <djurek@microsoft.com>
Date: Thu, 15 Sep 2022 13:44:25 -0700
Subject: [PATCH 16/23] RepoOwner

---
 eng/pipelines/templates/jobs/perf.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml
index e8de918da0..fa3c8ab54a 100644
--- a/eng/pipelines/templates/jobs/perf.yml
+++ b/eng/pipelines/templates/jobs/perf.yml
@@ -40,4 +40,6 @@ extends:
     EnvVars: ${{ parameters.EnvVars}}
     InstallLanguageSteps:
       - template: /eng/pipelines/templates/steps/vcpkg-clone.yml
+        parameters: 
+          RepoOwner: Azrue
       - template: /eng/pipelines/templates/steps/vcpkg.yml
\ No newline at end of file

From 88358f28a5f7f234e9ef2f291646568680d2dffb Mon Sep 17 00:00:00 2001
From: Daniel Jurek <djurek@microsoft.com>
Date: Thu, 15 Sep 2022 13:47:41 -0700
Subject: [PATCH 17/23] Correct repo owner name

---
 eng/pipelines/templates/jobs/perf.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml
index fa3c8ab54a..fcc455d383 100644
--- a/eng/pipelines/templates/jobs/perf.yml
+++ b/eng/pipelines/templates/jobs/perf.yml
@@ -41,5 +41,5 @@ extends:
     InstallLanguageSteps:
       - template: /eng/pipelines/templates/steps/vcpkg-clone.yml
         parameters: 
-          RepoOwner: Azrue
+          RepoOwner: Microsoft
       - template: /eng/pipelines/templates/steps/vcpkg.yml
\ No newline at end of file

From dfeda01f1d89a9b5e6219b2879a30a3f0ece849c Mon Sep 17 00:00:00 2001
From: Daniel Jurek <djurek@microsoft.com>
Date: Thu, 15 Sep 2022 13:52:32 -0700
Subject: [PATCH 18/23] Remove vcpkg.yml (we don't need to write)

---
 eng/pipelines/templates/jobs/perf.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml
index fcc455d383..a69cc1a0bc 100644
--- a/eng/pipelines/templates/jobs/perf.yml
+++ b/eng/pipelines/templates/jobs/perf.yml
@@ -42,4 +42,3 @@ extends:
       - template: /eng/pipelines/templates/steps/vcpkg-clone.yml
         parameters: 
           RepoOwner: Microsoft
-      - template: /eng/pipelines/templates/steps/vcpkg.yml
\ No newline at end of file

From 54863d36cb47d8e70018d8fb3b07560714fc312b Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Tue, 20 Sep 2022 14:18:45 -0700
Subject: [PATCH 19/23] PR trigger

---
 sdk/core/perf.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/core/perf.yml b/sdk/core/perf.yml
index 4cc953cf3e..3346a26a86 100644
--- a/sdk/core/perf.yml
+++ b/sdk/core/perf.yml
@@ -17,7 +17,7 @@ parameters:
   default: '5'
 - name: AdditionalArguments
   displayName: AdditionalArguments (passed to PerfAutomation)
-  type: string
+  type: string 
   default: ' '
 
 extends:

From 0da003d105988087c31384ba94d3582891b54282 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Tue, 20 Sep 2022 14:21:06 -0700
Subject: [PATCH 20/23] small change

---
 eng/common/TestResources/setup-environments.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/common/TestResources/setup-environments.yml b/eng/common/TestResources/setup-environments.yml
index 4d4a3eb1b0..a829b8dadf 100644
--- a/eng/common/TestResources/setup-environments.yml
+++ b/eng/common/TestResources/setup-environments.yml
@@ -28,7 +28,7 @@ steps:
       script: |
         eng/common/scripts/Import-AzModules.ps1
 
-        #$environmentSpec = @"
-        #  $(env-config-dogfood)
-        #"@ | ConvertFrom-Json -AsHashtable;
-        #Add-AzEnvironment @environmentSpec
+        $environmentSpec = @"
+          $(env-config-dogfood)
+        "@ | ConvertFrom-Json -AsHashtable;
+        Add-AzEnvironment @environmentSpec

From 2b7b7dd044d6f0e863abf573a7565dfb5bbc9e3d Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Mon, 26 Sep 2022 10:08:03 -0700
Subject: [PATCH 21/23] Update eng/pipelines/templates/jobs/perf.yml

Co-authored-by: Mike Harder <mharder@microsoft.com>
---
 eng/pipelines/templates/jobs/perf.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml
index a69cc1a0bc..b7bde9caac 100644
--- a/eng/pipelines/templates/jobs/perf.yml
+++ b/eng/pipelines/templates/jobs/perf.yml
@@ -2,7 +2,7 @@ parameters:
 - name: ServiceDirectory
   type: string
   default: ''
-- name: services
+- name: Services
   type: string
   default: ''
 - name: PackageVersions

From b66c3fc8871a45436001d7db30d4b493a9979b0a Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Mon, 26 Sep 2022 10:08:09 -0700
Subject: [PATCH 22/23] Update eng/pipelines/templates/jobs/perf.yml

Co-authored-by: Mike Harder <mharder@microsoft.com>
---
 eng/pipelines/templates/jobs/perf.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml
index b7bde9caac..4e1d328449 100644
--- a/eng/pipelines/templates/jobs/perf.yml
+++ b/eng/pipelines/templates/jobs/perf.yml
@@ -29,7 +29,7 @@ extends:
   parameters:
     Variables:
     - template: /eng/pipelines/templates/variables/globals.yml
-    Language: CPP
+    Language: Cpp
     ServiceDirectory: ${{ parameters.ServiceDirectory }}
     Services: ${{ parameters.Services }}
     PackageVersions: ${{ parameters.PackageVersions }}

From b0cfd35c8058f502f3e62f7556c30d4df69c4284 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Mon, 26 Sep 2022 10:08:18 -0700
Subject: [PATCH 23/23] Update sdk/core/perf.yml

Co-authored-by: Mike Harder <mharder@microsoft.com>
---
 sdk/core/perf.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/core/perf.yml b/sdk/core/perf.yml
index 3346a26a86..a8494272b1 100644
--- a/sdk/core/perf.yml
+++ b/sdk/core/perf.yml
@@ -2,7 +2,7 @@ parameters:
 - name: PackageVersions
   displayName: PackageVersions (regex of package versions to run)
   type: string
-  default: '1|source'
+  default: 'source'
 - name: Tests
   displayName: Tests (regex of tests to run)
   type: string