WorkSafeBC-Common-Engineering · wpschaub · Feb 21, 2023 · Feb 19, 2023
diff --git a/blueprints/__101__/azure-pipeline-__101__-cd.yml b/blueprints/__101__/azure-pipeline-__101__-cd.yml
@@ -98,6 +98,26 @@ stages:
       - SecurityAutomation
       - SecurityReview
 
+# -----------------------------------------------------------------------------------------------------
+# PRE-PROD AUTOMATION SCANS STAGE
+# -----------------------------------------------------------------------------------------------------
+- ${{ if and(eq(parameters.stage.production.name, 'Production'), or(eq(variables['Build.SourceBranch'], 'refs/heads/release'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}:
+  - template: /templates/pre-prod/azure-pipeline-pre-prod-automation.yml@CeBlueprints
+    parameters:
+      applicationBlueprint: ${{parameters.stage.preProdAutomation.applicationBlueprint}}
+      modeElite:            ${{parameters.stage.preProdAutomation.modeElite}}
+      dependsOn:
+        - ContinuousIntegration
+        - ${{ if eq(parameters.stage.development.name, 'Development') }}:
+          - Development
+        - ${{ if eq(parameters.stage.systemTest.name, 'SystemTest') }}:
+          - SystemTest
+        - QAScans
+        - SecurityAutomation
+        - SecurityReview
+        - ${{ if eq(parameters.stage.staging.name, 'Staging') }}:
+          - Staging
+
 # -----------------------------------------------------------------------------------------------------
 # PRODUCTION STAGE
 # -----------------------------------------------------------------------------------------------------
@@ -118,4 +138,5 @@ stages:
       - SecurityAutomation
       - SecurityReview
       - ${{ if eq(parameters.stage.staging.name, 'Staging') }}:
-        - Staging
+        - Staging
+      - PreProdAutomation
diff --git a/blueprints/__101__/azure-pipeline-__101__-control.yml b/blueprints/__101__/azure-pipeline-__101__-control.yml
@@ -19,7 +19,7 @@ parameters:
 # CI Blueprint optionals
 - name:     versionSpec
   type:     string
-  default:  '5.11.x' # change default from 5.6.3 to 5.11.x 
+  default:  '5.11.x' # switch from 5.6.3 to 5.11.x as default
 # CD Blueprint optionals
 - name:     suppressCD
   type:     boolean
@@ -90,6 +90,9 @@ stages:
         qaScans:
           applicationBlueprint:           ${{parameters.applicationBlueprint}}
           modeElite:                      ${{parameters.modeElite}}
+        preProdAutomation:
+          applicationBlueprint:           ${{parameters.applicationBlueprint}}
+          modeElite:                      ${{parameters.modeElite}}
 
 # --------------------------------------------------------------------------
 # END OF PIPELINE

diff --git a/blueprints/azure-function/azure-pipeline-azure-function-cd.yml b/blueprints/azure-function/azure-pipeline-azure-function-cd.yml
@@ -104,6 +104,26 @@ stages:
       - SecurityAutomation
       - SecurityReview
 
+# -----------------------------------------------------------------------------------------------------
+# PRE-PROD AUTOMATION SCANS STAGE
+# -----------------------------------------------------------------------------------------------------
+- ${{ if and(eq(parameters.stage.production.name, 'Production'), or(eq(variables['Build.SourceBranch'], 'refs/heads/release'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}:
+  - template: /templates/pre-prod/azure-pipeline-pre-prod-automation.yml@CeBlueprints
+    parameters:
+      applicationBlueprint: ${{parameters.stage.preProdAutomation.applicationBlueprint}}
+      modeElite:            ${{parameters.stage.preProdAutomation.modeElite}}
+      dependsOn:
+        - ContinuousIntegration
+        - ${{ if eq(parameters.stage.development.name, 'Development') }}:
+          - Development
+        - ${{ if eq(parameters.stage.systemTest.name, 'SystemTest') }}:
+          - SystemTest
+        - QAScans
+        - SecurityAutomation
+        - SecurityReview
+        - ${{ if eq(parameters.stage.staging.name, 'Staging') }}:
+          - Staging
+
 # -----------------------------------------------------------------------------------------------------
 # PRODUCTION STAGE
 # -----------------------------------------------------------------------------------------------------
@@ -127,4 +147,5 @@ stages:
       - SecurityAutomation
       - SecurityReview
       - ${{ if eq(parameters.stage.staging.name, 'Staging') }}:
-        - Staging
+        - Staging
+      - PreProdAutomation
diff --git a/blueprints/azure-function/azure-pipeline-azure-function-control.yml b/blueprints/azure-function/azure-pipeline-azure-function-control.yml
@@ -21,7 +21,7 @@ parameters:
 # CI Blueprint optionals
 - name:     versionSpec
   type:     string
-  default:  '5.11.x' # change default from 5.6.3 to 5.11.x 
+  default:  '5.11.x' # switch from 5.6.3 to 5.11.x as default
 # CD Blueprint optionals
 - name:     suppressCD
   type:     boolean
@@ -99,6 +99,9 @@ stages:
         qaScans:
           applicationBlueprint:           ${{parameters.applicationBlueprint}}
           modeElite:                      ${{parameters.modeElite}}
+        preProdAutomation:
+          applicationBlueprint:           ${{parameters.applicationBlueprint}}
+          modeElite:                      ${{parameters.modeElite}}
 
 # --------------------------------------------------------------------------
 # END OF PIPELINE

diff --git a/blueprints/nuget-package/azure-pipeline-nuget-package-cd.yml b/blueprints/nuget-package/azure-pipeline-nuget-package-cd.yml
@@ -99,6 +99,26 @@ stages:
       - SecurityAutomation
       - SecurityReview
 
+# -----------------------------------------------------------------------------------------------------
+# PRE-PROD AUTOMATION SCANS STAGE
+# -----------------------------------------------------------------------------------------------------
+- ${{ if and(eq(parameters.stage.production.name, 'Production'), or(eq(variables['Build.SourceBranch'], 'refs/heads/release'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}:
+  - template: /templates/pre-prod/azure-pipeline-pre-prod-automation.yml@CeBlueprints
+    parameters:
+      applicationBlueprint: ${{parameters.stage.preProdAutomation.applicationBlueprint}}
+      modeElite:            ${{parameters.stage.preProdAutomation.modeElite}}
+      dependsOn:
+        - ContinuousIntegration
+        - ${{ if eq(parameters.stage.development.name, 'Development') }}:
+          - Development
+        - ${{ if eq(parameters.stage.systemTest.name, 'SystemTest') }}:
+          - SystemTest
+        - QAScans
+        - SecurityAutomation
+        - SecurityReview
+        - ${{ if eq(parameters.stage.staging.name, 'Staging') }}:
+          - Staging
+
 # -----------------------------------------------------------------------------------------------------
 # PRODUCTION STAGE
 # -----------------------------------------------------------------------------------------------------
@@ -120,4 +140,5 @@ stages:
       - SecurityAutomation
       - SecurityReview
       - ${{ if eq(parameters.stage.staging.name, 'Staging') }}:
-        - Staging
+        - Staging
+      - PreProdAutomation
diff --git a/blueprints/nuget-package/azure-pipeline-nuget-package-control.yml b/blueprints/nuget-package/azure-pipeline-nuget-package-control.yml
@@ -30,7 +30,7 @@ parameters:
 # CI Blueprint optionals
 - name:     versionSpec
   type:     string
-  default:  '5.11.x' # change default from 5.6.3 to 5.11.x 
+  default:  '5.11.x' # switch from 5.6.3 to 5.11.x as default
 - name:     useDefaultConfig
   type:     boolean
   default:  false
@@ -113,6 +113,9 @@ stages:
         qaScans:
           applicationBlueprint:           ${{parameters.applicationBlueprint}}
           modeElite:                      ${{parameters.modeElite}}
+        preProdAutomation:
+          applicationBlueprint:           ${{parameters.applicationBlueprint}}
+          modeElite:                      ${{parameters.modeElite}}
 
 # --------------------------------------------------------------------------
 # END OF PIPELINE

diff --git a/blueprints/universal-artifact/azure-pipeline-universal-artifact-cd.yml b/blueprints/universal-artifact/azure-pipeline-universal-artifact-cd.yml
@@ -49,7 +49,6 @@ stages:
       - Development
     - ${{ if eq(parameters.stage.systemTest.name, 'SystemTest') }}:
       - SystemTest
-    - SecurityAutomation
 
 # -----------------------------------------------------------------------------------------------------
 # QA SCANS STAGE
@@ -65,6 +64,7 @@ stages:
     - ${{ if eq(parameters.stage.systemTest.name, 'SystemTest') }}:
       - SystemTest
 
+
 # -----------------------------------------------------------------------------------------------------
 # SECURITY REVIEW STAGE
 # -----------------------------------------------------------------------------------------------------
@@ -79,6 +79,7 @@ stages:
         - Development
       - ${{ if eq(parameters.stage.systemTest.name, 'SystemTest') }}:
         - SystemTest
+      - SecurityAutomation
 
 # -----------------------------------------------------------------------------------------------------
 # STAGING STAGE
@@ -102,6 +103,26 @@ stages:
       - SecurityAutomation
       - SecurityReview
 
+# -----------------------------------------------------------------------------------------------------
+# PRE-PROD AUTOMATION SCANS STAGE
+# -----------------------------------------------------------------------------------------------------
+- ${{ if and(eq(parameters.stage.production.name, 'Production'), or(eq(variables['Build.SourceBranch'], 'refs/heads/release'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}:
+  - template: /templates/pre-prod/azure-pipeline-pre-prod-automation.yml@CeBlueprints
+    parameters:
+      applicationBlueprint: ${{parameters.stage.preProdAutomation.applicationBlueprint}}
+      modeElite:            ${{parameters.stage.preProdAutomation.modeElite}}
+      dependsOn:
+        - ContinuousIntegration
+        - ${{ if eq(parameters.stage.development.name, 'Development') }}:
+          - Development
+        - ${{ if eq(parameters.stage.systemTest.name, 'SystemTest') }}:
+          - SystemTest
+        - QAScans
+        - SecurityAutomation
+        - SecurityReview
+        - ${{ if eq(parameters.stage.staging.name, 'Staging') }}:
+          - Staging
+
 # -----------------------------------------------------------------------------------------------------
 # PRODUCTION STAGE
 # -----------------------------------------------------------------------------------------------------
@@ -124,4 +145,5 @@ stages:
       - SecurityAutomation
       - SecurityReview
       - ${{ if eq(parameters.stage.staging.name, 'Staging') }}:
-        - Staging
+        - Staging
+      - PreProdAutomation
diff --git a/blueprints/universal-artifact/azure-pipeline-universal-artifact-control.yml b/blueprints/universal-artifact/azure-pipeline-universal-artifact-control.yml
@@ -18,7 +18,7 @@ parameters:
 # CI Blueprint optionals
 - name:     versionSpec
   type:     string
-  default:  '5.11.x' # change default from 5.6.3 to 5.11.x 
+  default:  '5.11.x' # switch from 5.6.3 to 5.11.x as default
 # CD Blueprint optionals
 - name:     suppressCD
   type:     boolean
@@ -94,6 +94,9 @@ stages:
         qaScans:
           applicationBlueprint:           ${{parameters.applicationBlueprint}}
           modeElite:                      ${{parameters.modeElite}}
+        preProdAutomation:
+          applicationBlueprint:           ${{parameters.applicationBlueprint}}
+          modeElite:                      ${{parameters.modeElite}}
 
 # --------------------------------------------------------------------------
 # END OF PIPELINE

diff --git a/templates/pre-prod/azure-pipeline-pre-prod-automation.yml b/templates/pre-prod/azure-pipeline-pre-prod-automation.yml
@@ -0,0 +1,33 @@
+parameters:
+- name:     dependsOn
+  type:     object
+  default:  []
+- name:     applicationBlueprint
+  type:     string
+- name:     modeElite
+  type:     boolean
+  default:  false
+
+stages:
+# -----------------------------------------------------------------------------------------------------
+# QUALITY ASSURANCE SCANS STAGE
+# -----------------------------------------------------------------------------------------------------
+- stage:         'PreProdAutomation'
+  displayName:   'Pre-Prod Automation (PPA)'
+  dependsOn:
+  - ${{ each stage in parameters.dependsOn }}:
+    - ${{stage}}
+  pool:
+    vmImage:      'ubuntu-latest'
+  jobs:
+  - job:          'PreProdAutomation'
+    steps:
+    # List all environment variables within this agent
+    - bash: 'env | sort'
+      displayName: Bootstrap Dump env variables
+
+    # Inject the QA scans template into the pipeline
+    - template:   /templates/pre-prod/pre-prod-automation.yml@CeBlueprints
+      parameters:
+        applicationBlueprint: ${{parameters.applicationBlueprint}}
+        modeElite:            ${{parameters.modeElite}}
diff --git a/templates/pre-prod/pre-prod-automation.yml b/templates/pre-prod/pre-prod-automation.yml
@@ -0,0 +1,13 @@
+parameters:
+- name:     applicationBlueprint
+  type:     string
+- name:     modeElite
+  type:     boolean
+  default:  false
+
+steps:
+
+# -----------------------------------------------------------------------------------------------------
+# PRE-PRODUCTION AUTOMATION STAGE
+# -----------------------------------------------------------------------------------------------------
+- script: echo 'Pre-Production Automation Placeholder ***********************************'