[Rollout] Production rollout 2024-08-22 (#3859)

dotnet · Aug 21, 2024 · dac7a16 · dac7a16
2 parents 06bd7a1 + 92cd690
commit dac7a16
Show file tree

Hide file tree

Showing 240 changed files with 8,443 additions and 1,587 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dnceng.secretmanager": {
-      "version": "1.1.0-beta.24374.1",
+      "version": "1.1.0-beta.24413.3",
       "commands": [
         "secret-manager"
       ]
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dnceng.configuration.bootstrap": {
-      "version": "1.1.0-beta.24374.1",
+      "version": "1.1.0-beta.24413.3",
       "commands": [
         "bootstrap-dnceng-configuration"
       ]

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -17,6 +17,7 @@
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure" Version="$(AspireVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Redis" Version="$(AspireVersion)" />
     <PackageVersion Include="Azure.Core" Version="1.41.0" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.0" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.2.3" />
@@ -26,6 +27,7 @@
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.1.0" />
     <PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.6.0" />
     <PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
+    <PackageVersion Include="Azure.Storage.Queues" Version="12.19.1" />
     <PackageVersion Include="CommandLineParser" Version="2.2.1" />
     <PackageVersion Include="CoreHealthMonitor" Version="$(CoreHealthMonitorVersion)" />
     <PackageVersion Include="EntityFrameworkCore.Triggers" Version="1.1.1" />
@@ -34,6 +36,7 @@
     <PackageVersion Include="FluentValidation.AspNetCore" Version="8.6.2" />
     <PackageVersion Include="Humanizer.Core" Version="2.14.1" />
     <PackageVersion Include="LibGit2Sharp" Version="0.27.2" />
+    <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.22.0" />
     <PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
     <PackageVersion Include="Microsoft.AspNetCore.ApiPagination" Version="$(MicrosoftAspNetCoreApiPaginationVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.ApiVersioning.Analyzers" Version="$(MicrosoftAspNetCoreApiVersioningAnalyzersVersion)" />
@@ -46,6 +49,7 @@
     <PackageVersion Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.0.2" />
     <PackageVersion Include="Microsoft.AspNetCore.WebHooks.Receivers.GitHub" Version="1.0.0-preview2-final" />
     <PackageVersion Include="Microsoft.AspNetCore.WebHooks.Receivers" Version="1.0.0-preview2-final" />
+    <PackageVersion Include="Microsoft.Azure.StackExchangeRedis" Version="3.1.0" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="17.3.2" />
     <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.3.2" />
@@ -94,9 +98,11 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
@@ -114,6 +120,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.14" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NRedisStack" Version="0.12.0" />
     <PackageVersion Include="NuGet.Configuration" Version="6.9.1" />
     <PackageVersion Include="NuGet.Packaging" Version="6.9.1" />
     <PackageVersion Include="NuGet.Protocol" Version="6.9.1" />
@@ -127,7 +134,9 @@
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
     <PackageVersion Include="ServiceFabricMocks" Version="$(ServiceFabricMocksVersion)" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.7.0" />
     <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
@@ -143,4 +152,4 @@
     <PackageVersion Include="Verify.NUnit" Version="19.6" />
     <PackageVersion Include="YamlDotNet" Version="15.1.2" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/arcade-services.sln b/arcade-services.sln
@@ -118,6 +118,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maestro.Common", "src\Maestro\Maestro.Common\Maestro.Common.csproj", "{16F086DD-8387-44BB-87D5-CD804355A110}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.SubscriptionTriggerer", "src\ProductConstructionService\ProductConstructionService.SubscriptionTriggerer\ProductConstructionService.SubscriptionTriggerer.csproj", "{C70CD49F-052C-472B-A420-4215B708C478}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maestro.Api.Model", "src\Maestro\Maestro.Api.Model\Maestro.Api.Model.csproj", "{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.SubscriptionTriggerer.Tests", "test\ProductConstructionService.SubscriptionTriggerer.Tests\ProductConstructionService.SubscriptionTriggerer.Tests.csproj", "{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.Common", "src\ProductConstructionService\ProductConstructionService.Common\ProductConstructionService.Common.csproj", "{9C6F75EE-618D-4268-88B6-9E4C99B062FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.LongestBuildPathUpdater", "src\ProductConstructionService\ProductConstructionService.LongestBuildPathUpdater\ProductConstructionService.LongestBuildPathUpdater.csproj", "{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.LongestBuildPathUpdater.Tests", "test\ProductConstructionService.LongestBuildPathUpdater.Tests\ProductConstructionService.LongestBuildPathUpdater.Tests.csproj", "{D40EADB7-5D48-421B-806D-6E2F79C077F8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.WorkItems", "src\ProductConstructionService\ProductConstructionService.WorkItems\ProductConstructionService.WorkItems.csproj", "{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -525,6 +539,90 @@ Global
 		{16F086DD-8387-44BB-87D5-CD804355A110}.Release|x64.Build.0 = Release|Any CPU
 		{16F086DD-8387-44BB-87D5-CD804355A110}.Release|x86.ActiveCfg = Release|Any CPU
 		{16F086DD-8387-44BB-87D5-CD804355A110}.Release|x86.Build.0 = Release|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Debug|x64.Build.0 = Debug|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Debug|x86.Build.0 = Debug|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Release|x64.ActiveCfg = Release|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Release|x64.Build.0 = Release|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Release|x86.ActiveCfg = Release|Any CPU
+		{C70CD49F-052C-472B-A420-4215B708C478}.Release|x86.Build.0 = Release|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Debug|x64.Build.0 = Debug|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Debug|x86.Build.0 = Debug|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Release|x64.ActiveCfg = Release|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Release|x64.Build.0 = Release|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Release|x86.ActiveCfg = Release|Any CPU
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66}.Release|x86.Build.0 = Release|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Debug|x64.Build.0 = Debug|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Debug|x86.Build.0 = Debug|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Release|x64.ActiveCfg = Release|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Release|x64.Build.0 = Release|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Release|x86.ActiveCfg = Release|Any CPU
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26}.Release|x86.Build.0 = Release|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Release|x64.Build.0 = Release|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF}.Release|x86.Build.0 = Release|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Debug|x64.Build.0 = Debug|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Debug|x86.Build.0 = Debug|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Release|x64.ActiveCfg = Release|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Release|x64.Build.0 = Release|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Release|x86.ActiveCfg = Release|Any CPU
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19}.Release|x86.Build.0 = Release|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Debug|x64.Build.0 = Debug|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Debug|x86.Build.0 = Debug|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Release|x64.ActiveCfg = Release|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Release|x64.Build.0 = Release|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Release|x86.ActiveCfg = Release|Any CPU
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8}.Release|x86.Build.0 = Release|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Debug|x64.Build.0 = Debug|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Debug|x86.Build.0 = Debug|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Release|x64.ActiveCfg = Release|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Release|x64.Build.0 = Release|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Release|x86.ActiveCfg = Release|Any CPU
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -567,6 +665,13 @@ Global
 		{70D48B7A-DBFE-4762-A83F-4617ECF80838} = {AE791E26-78E1-4936-BCF4-1BF5152CBBD6}
 		{964FA796-358E-48AE-B75C-E42132600BCC} = {243A4561-BF35-405A-AF12-AC57BB27796D}
 		{16F086DD-8387-44BB-87D5-CD804355A110} = {AE791E26-78E1-4936-BCF4-1BF5152CBBD6}
+		{C70CD49F-052C-472B-A420-4215B708C478} = {243A4561-BF35-405A-AF12-AC57BB27796D}
+		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66} = {AE791E26-78E1-4936-BCF4-1BF5152CBBD6}
+		{6D072A10-3D4B-4F3A-9A12-32F3E8CF8B26} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
+		{9C6F75EE-618D-4268-88B6-9E4C99B062FF} = {243A4561-BF35-405A-AF12-AC57BB27796D}
+		{BE0088E3-A8FF-4F05-9456-E8BAD2E50A19} = {243A4561-BF35-405A-AF12-AC57BB27796D}
+		{D40EADB7-5D48-421B-806D-6E2F79C077F8} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
+		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA} = {243A4561-BF35-405A-AF12-AC57BB27796D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {32B9C883-432E-4FC8-A1BF-090EB033DD5B}

diff --git a/azure-pipelines-product-construction-service.yml b/azure-pipelines-product-construction-service.yml
@@ -12,6 +12,7 @@ pr:
       - main
 
 variables:
+- group: Publish-Build-Assets
 - name: resourceGroupName
   value: product-construction-service
 - name: containerName
@@ -22,6 +23,8 @@ variables:
   # https://dev.azure.com/dnceng/internal/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=189
   - name: containerappName
     value: product-construction-int
+  - name: containerjobNames
+    value: sub-triggerer-twicedaily-int,sub-triggerer-daily-int,sub-triggerer-weekly-int,longest-path-updater-job-int
   - name: containerRegistryName
     value: productconstructionint
   - name: containerappEnvironmentName
@@ -32,6 +35,8 @@ variables:
     value: ProductConstructionServiceDeploymentInt
   - name: authServiceConnection
     value: "Darc: Maestro Staging"
+  - name: MaestroAppId
+    value: $(MaestroStagingAppClientId)
   - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
     - name: devBranchSuffix
       value:
@@ -101,7 +106,7 @@ stages:
             scriptLocation: inlineScript
             inlineScript: |
               # Fetch pcs token
-              $token = (az account get-access-token --resource "$env:servicePrincipalId" | ConvertFrom-Json).accessToken
+              $token = (az account get-access-token --resource "$(MaestroAppId)" | ConvertFrom-Json).accessToken
               "##vso[task.setvariable variable=Token;isOutput=true;isSecret=true]$token"
 
         - task: AzureCLI@2
@@ -117,6 +122,7 @@ stages:
               -containerRegistryName $(containerRegistryName)
               -imageName $(containerName)
               -token $(GetAuthInfo.Token)
+              -containerjobNames '$(containerjobNames)'
           displayName: Deploy container app
 
         - task: AzureCLI@2