syncing with shared pipeline

devops/service-pipeline-release.yml

-#####################
-# README: Defines a template that's triggered when a PR is merged into master. The intent for this
-#         template is to release the latest service artifact to all provider environments.
-#####################
-
-trigger: none
-
-pr:
-  autoCancel: false
-  branches:
-    include:
-      - '*'
-    exclude:
-      - master
-  paths:
-    exclude:
-      - /**/*.md
-      - .gitignore
-      - images/
-
-variables:
-  - group: 'Azure Common Secrets Prod'
-  - group: 'Azure - Common Prod'
-
-  - name: serviceName
-    value: 'indexer'
-  - name: AGENT_POOL
-    value: 'dps-build'
-
-resources:
-  repositories:
-    - repository: infrastructure-templates
-      type: git
-      name: open-data-ecosystem/infrastructure-templates
-
-stages:
-  - template: devops/service-pipelines/build-stage.yml@infrastructure-templates
-    parameters:
-      copyFileContents: |
-          pom.xml
-          provider/${{ variables.serviceName }}-azure/maven/settings.xml
-          provider/${{ variables.serviceName }}-azure/pom.xml
-          provider/${{ variables.serviceName }}-azure/target/*-spring-boot.jar
-      copyFileContentsToFlatten: ''
-      serviceCoreMavenOptions: '--settings ./indexer-core/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN) -U'
-      mavenOptions: '--settings ./provider/${{ variables.serviceName }}-azure/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN) -U -P indexer-azure'
-      mavenGoal: 'package'
-      serviceBase: ${{ variables.serviceName }}
-      testingRootFolder: 'testing'
-  - template: devops/service-pipelines/deploy-stages.yml@infrastructure-templates
-    parameters:
-      serviceName: ${{ variables.serviceName }}
-      providers:
-        -  name: Azure
-           environments: ['prod']

devops/service-pipeline.yml

 #####################
-# README: Defines a template that's triggered when either a PR is created or updated. The intent for this
-#         template is to release the latest service artifact to only the dev integration environment to
-#         validate the integration tests have passed. You'd typically add this pipeline to your master branch policy.
+# README: Defines a template to be used as a starting point for defining a service pipeline
 #####################
 
-trigger: none
+trigger:
+  batch: true
+  branches:
+    include:
+      - master
+  paths:
+    exclude:
+      - /**/*.md
+      - .gitignore
+      - images/
 
 pr:
-  autoCancel: false
+  autoCancel: true #new
   branches:
     include:
       - '*'
-    exclude:
-      - master
   paths:
     exclude:
       - /**/*.md
@@ -36,15 +41,16 @@ resources:
 stages:
   - template: devops/service-pipelines/build-stage.yml@infrastructure-templates
     parameters:
+      mavenGoal: 'package'
+      mavenPublishJUnitResults: true
+      serviceCoreMavenOptions: '--settings ./indexer-core/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN) -U'
+      mavenOptions: '--settings ./provider/${{ variables.serviceName }}-azure/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN) -U -P indexer-azure'
       copyFileContents: |
           pom.xml
           provider/${{ variables.serviceName }}-azure/maven/settings.xml
           provider/${{ variables.serviceName }}-azure/pom.xml
           provider/${{ variables.serviceName }}-azure/target/*-spring-boot.jar
       copyFileContentsToFlatten: ''
-      serviceCoreMavenOptions: '--settings ./indexer-core/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN) -U'
-      mavenOptions: '--settings ./provider/${{ variables.serviceName }}-azure/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN) -U -P indexer-azure'
-      mavenGoal: 'package'
       serviceBase: ${{ variables.serviceName }}
       testingRootFolder: 'testing'
   - template: devops/service-pipelines/deploy-stages.yml@infrastructure-templates
@@ -54,4 +60,9 @@ stages:
       testCoreMavenOptions: '--settings $(System.DefaultWorkingDirectory)/drop/deploy/testing/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN) -U'
       providers:
         -  name: Azure
-           environments: ['devint']
+           # Merges into Master
+           ${{ if eq(variables['Build.SourceBranchName'], 'master') }}:
+            environments: ['devint', 'qa', 'prod']
+           # PR updates / creations
+           ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
+            environments: ['devint']