Remove OneBranchType parameter and use Official type only

eng/pipelines/akv-official-pipeline.yml

@@ -9,14 +9,6 @@ name: $(Year:YY)$(DayOfYear)$(Rev:.r)
 # @TODO: Add triggers and schedules
 
 parameters:
-    - name: oneBranchType
-      displayName: 'OneBranch template'
-      type: 'string'
-      values:
-          - 'Official'
-          - 'NonOfficial'
-      default: 'Official'
-
     - name: buildConfiguration
       displayName: 'Build configuration'
       type: 'string'
@@ -49,7 +41,7 @@ resources:
           ref: 'refs/heads/main'
 
 extends:
-    template: 'v2/OneBranch.${{ parameters.oneBranchType }}.CrossPlat.yml@templates'
+    template: 'v2/OneBranch.Official.CrossPlat.yml@templates'
 
     parameters:
         featureFlags:
@@ -118,7 +110,7 @@ extends:
             tsa:
                 # OneBranch publishes all sdl results to TSA. If TSA is disabled all SDL tools will
                 # be forced into 'break' build mode.
-                enabled: ${{ eq(parameters.oneBranchType, 'Official') }}
+                enabled: true
                 configFile: '$(REPO_ROOT)/.config/tsaoptions.json'
 
         stages:

eng/pipelines/dotnet-sqlclient-signing-pipeline.yml

@@ -51,13 +51,6 @@ parameters: # parameters are shown up in ADO UI in a build queue time
   type: string
   default: 'net462'
 
-- name: oneBranchType
-  displayName: 'Select OneBranch template'
-  default: Official
-  values:
-  - NonOfficial
-  - Official
-
 - name: isPreview
   displayName: 'Is this a preview build?'
   type: boolean
@@ -86,7 +79,7 @@ resources:
       ref: refs/heads/main
 
 extends:
-  template: v2/OneBranch.${{parameters.oneBranchType }}.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
+  template: v2/OneBranch.Official.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
   parameters:
     featureFlags:
       # Suggested by MerlinBot (https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient/pullrequest/4882)
@@ -100,11 +93,6 @@ extends:
         enabled: true
       apiscan:
         enabled: true
-        # For non-official builds, the OneBranch template seems to set APIScan's
-        # 'break' to true even when TSA is enabled.  We don't want APIScan to
-        # break non-official builds, so we explicitly set 'break' to false here.
-        ${{ if ne(parameters.oneBranchType, 'Official') }}:
-          break: false
         softwareFolder: $(softwareFolder)
         symbolsFolder: $(symbolsFolder)
         softwarename: Microsoft.Data.SqlClient