From d24653bd4325a3e57603f23ee668358f52896916 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis@ez13.net>
Date: Tue, 9 Nov 2021 15:35:45 -0800
Subject: [PATCH] Update release instructions with link to new build

---
 .../azureDevOps/releasePipeline.yml           | 29 ++++++++++++++---
 .../templates/release/approvalJob.yml         | 31 +++++++++++++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml

diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index 4e941483315..9c6b740cc58 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -244,11 +244,32 @@ stages:
   dependsOn:
     - PublishPackages
     - ChangesToMaster
+  variables:
+    # adds newPwshOrgName (exists in new and old org)
+    - group: PowerShellRelease
   jobs:
-  - deployment: ReleaseSnap
-    displayName: Release Snap
-    pool: server
-    environment: PSReleaseSnapRelease
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Start the release build
+      instructions: |
+        Start the snap pipeline at: https://dev.azure.com/$(newPwshOrgName)/PowerShell/_build?definitionId=49&_a=summary
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Approve the release
+      instructions: |
+        Once the build is finished, approve the release of all channels.
+
+- stage: ReleaseToMU
+  displayName: Release to MU
+  dependsOn:
+    - PublishPackages
+    - ChangesToMaster
+  jobs:
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Release to MU
+      instructions: |
+        Notify the PM team to start the process of releasing to MU.
 
 - stage: UpdateDotnetDocker
   dependsOn: GitHubManualTasks
diff --git a/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml b/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml
new file mode 100644
index 00000000000..8404e64e0ef
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml
@@ -0,0 +1,31 @@
+parameters:
+  - name: displayName
+    type: string
+  - name: instructions
+    type: string
+  - name: jobName
+    type: string
+    default: approval
+  - name: timeoutInMinutes
+    type: number
+    # 2 days
+    default: 2880
+  - name: onTimeout
+    type: string
+    default: 'reject'
+    values:
+        - resume
+        - reject
+
+jobs:
+  - job: ${{ parameters.jobName }}
+    displayName: ${{ parameters.displayName }}
+    pool: server
+    timeoutInMinutes: 4320 # job times out in 3 days
+    steps:
+    - task: ManualValidation@0
+      displayName: ${{ parameters.displayName }}
+      timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+      inputs:
+        instructions: ${{ parameters.instructions }}
+        onTimeout: ${{ parameters.onTimeout }}