From 14c5e3cb9c1354b36085633210a9820fcbfe82fd Mon Sep 17 00:00:00 2001
From: wingetbot <63816999+wingetbot@users.noreply.github.com>
Date: Mon, 20 Jun 2022 18:18:01 -0700
Subject: [PATCH] Automatically completed pull request for
 release/WinGetSvc-Release-20220615.1-01, source branch is

Co-authored-by: Release bot <pmai@microsoft.com>
---
 .../rebuild-pipeline.yaml                     | 39 ----------
 .../rebuild-rest-pipeline.yaml                | 76 +++++++++++++++++++
 2 files changed, 76 insertions(+), 39 deletions(-)
 create mode 100644 DevOpsPipelineDefinitions/rebuild-rest-pipeline.yaml

diff --git a/DevOpsPipelineDefinitions/rebuild-pipeline.yaml b/DevOpsPipelineDefinitions/rebuild-pipeline.yaml
index 375bbbebd0f..4af9141993d 100644
--- a/DevOpsPipelineDefinitions/rebuild-pipeline.yaml
+++ b/DevOpsPipelineDefinitions/rebuild-pipeline.yaml
@@ -10,7 +10,6 @@ variables:
   Rebuild.SkipManifestIndexUpdate: $[coalesce(variables.SkipManifestIndexUpdate, 'False')]
   Rebuild.SkipPausePublishPipeline: $[coalesce(variables.SkipPausePublishPipeline, 'False')]
   Rebuild.EnableContainerBackup: $[coalesce(variables.EnableContainerBackup, 'False')]
-  Rebuild.SkipRestSourceRebuild: $[coalesce(variables.SkipRestSourceRebuild, 'False')]
   Rebuild.ClearContainer: $[coalesce(variables.ClearContainer, 'False')]
 
 jobs:
@@ -145,43 +144,6 @@ jobs:
         }
       waitForCompletion: "true"
 
-# Agentless phase. Depends on previous job.
-- job: 'PublishToRestSource'
-  pool: server
-  timeoutInMinutes: 1500
-  displayName: 'Publish to rest source'
-  dependsOn:
-    - 'Rebuild'
-    - 'SignPackage'
-    - 'Publish'
-  condition: and(succeeded(), ne(variables['Rebuild.SkipRestSourceRebuild'], 'True'))
-  variables:
-    HostKeySecret: $[ dependencies.Rebuild.outputs['wingetsetup.hostkey']]
-    RestSourceRebuildEndpointSecret: $[ dependencies.Rebuild.outputs['wingetsetup.restsourceRebuildEndpoint']]
-  steps:
-
-  # Rebuild Rest source.
-  - task: AzureFunction@1
-    displayName: 'Publish to rest source'
-    inputs:
-      function: '$(RestSourceRebuildEndpointSecret)'
-      key: '$(HostKeySecret)'
-      body: |
-        {
-        "operationId": "$(Build.BuildNumber)",
-        "BuildId": "$(Build.BuildId)",
-        "PlanUrl": "$(system.CollectionUri)",
-        "HubName": "$(system.HostType)",
-        "pipelineType": "RebuildPipeline",
-        "ProjectId": "$(system.TeamProjectId)",
-        "PlanId": "$(system.PlanId)", 
-        "JobId": "$(system.JobId)", 
-        "TimelineId": "$(system.TimelineId)", 
-        "TaskInstanceId": "$(system.TaskInstanceId)",
-        "AuthToken": "$(system.AccessToken)"
-        }
-      waitForCompletion: "true"
-
 # Agentless phase. Depends on previous job.
 - job: 'Cleanup'
   pool: server
@@ -191,7 +153,6 @@ jobs:
     - 'Rebuild'
     - 'SignPackage'
     - 'Publish'
-    - 'PublishToRestSource'
   condition: and(succeededOrFailed(), ne(variables['Rebuild.SkipPausePublishPipeline'], 'True'))
   variables:
     HostKeySecret: $[ dependencies.Rebuild.outputs['wingetsetup.hostkey']]
diff --git a/DevOpsPipelineDefinitions/rebuild-rest-pipeline.yaml b/DevOpsPipelineDefinitions/rebuild-rest-pipeline.yaml
new file mode 100644
index 00000000000..907d1073a59
--- /dev/null
+++ b/DevOpsPipelineDefinitions/rebuild-rest-pipeline.yaml
@@ -0,0 +1,76 @@
+# Rebuild pipeline for WinGet rest source.
+
+# Name of the run
+name: '$(Build.DefinitionName)-$(Build.DefinitionVersion)-$(Date:yyyyMMdd)-$(Rev:r)'
+
+trigger: none
+pr: none
+
+jobs:
+
+# Agent phase.
+- job: 'Rebuild'
+  displayName: 'Start Rebuild'
+  pool:
+    vmImage: 'windows-latest'
+  variables:
+    skipComponentGovernanceDetection: ${{ true }}
+    runCodesignValidationInjection: ${{ false }}
+  steps:
+
+  # Allow scripts to access the system token.
+  - checkout: none
+    persistCredentials: true
+
+  # Downloads all the setup files and its dependencies.
+  - task: AzureCLI@1
+    displayName: 'Azure Setup'
+    inputs:
+      azureSubscription: '$(WinGet.Subscription)'
+      scriptLocation: inlineScript
+      inlineScript: 'az storage blob download-batch -d . --pattern * -s servicewrapper --output none'
+    env:
+      AZURE_STORAGE_CONNECTION_STRING: $(ValidationStorageAccountConnectionString)
+
+  # WinGet setup
+  - script: 'winget_rebuild_setup.cmd'
+    name: 'wingetsetup'
+    displayName: 'WinGet Setup'
+    workingDirectory: scripts
+    env:
+      HOST_KEY: $(AzureFunctionHostKey)
+      RESTSOURCE_REBUILD_ENDPOINT: $(AzFuncRestSourceRebuildEndpoint)
+
+# Agentless phase. Depends on previous job.
+- job: 'PublishToRestSource'
+  pool: server
+  timeoutInMinutes: 1500
+  displayName: 'Publish to rest source'
+  dependsOn:
+    - 'Rebuild'
+  variables:
+    HostKeySecret: $[ dependencies.Rebuild.outputs['wingetsetup.hostkey']]
+    RestSourceRebuildEndpointSecret: $[ dependencies.Rebuild.outputs['wingetsetup.restsourceRebuildEndpoint']]
+  steps:
+
+  # Rebuild Rest source.
+  - task: AzureFunction@1
+    displayName: 'Publish to rest source'
+    inputs:
+      function: '$(RestSourceRebuildEndpointSecret)'
+      key: '$(HostKeySecret)'
+      body: |
+        {
+        "operationId": "$(Build.BuildNumber)",
+        "BuildId": "$(Build.BuildId)",
+        "PlanUrl": "$(system.CollectionUri)",
+        "HubName": "$(system.HostType)",
+        "pipelineType": "RebuildPipeline",
+        "ProjectId": "$(system.TeamProjectId)",
+        "PlanId": "$(system.PlanId)", 
+        "JobId": "$(system.JobId)", 
+        "TimelineId": "$(system.TimelineId)", 
+        "TaskInstanceId": "$(system.TaskInstanceId)",
+        "AuthToken": "$(system.AccessToken)"
+        }
+      waitForCompletion: "true"