Skip to content

Commit 7c3c86d

Browse files
authored
Remove unofficial pivot on host.official pipeline (#11352)
* Remove unofficial pivot on host.official pipeline * Remove comment
1 parent 9f60b30 commit 7c3c86d

File tree

2 files changed

+27
-56
lines changed

2 files changed

+27
-56
lines changed

eng/ci/official-build.yml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
parameters:
2-
- name: forceOfficial # this is used for testing the official CI from non-official branches.
3-
displayName: Use official templates for non-official branches
4-
type: boolean
5-
default: false
6-
- name: runTests
7-
displayName: Run tests (ignored for official branches)
8-
type: boolean
9-
default: true
10-
- name: signFiles
11-
displayName: Sign files (ignored for official branches)
12-
type: boolean
13-
default: false
14-
151
trigger:
162
batch: true
173
branches:
@@ -48,19 +34,9 @@ resources:
4834
variables:
4935
- template: /eng/ci/templates/variables/build.yml@self
5036
- template: /ci/variables/cfs.yml@eng
51-
- name: OfficialBranch
52-
value: ${{ or(eq(variables['Build.SourceBranch'], 'refs/heads/dev'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}
53-
- name: SignFiles # variable for access in other templates
54-
value: ${{ or(eq(variables.OfficialBranch, true), eq(parameters.signFiles, true)) }}
55-
- name: '1ESTemplate'
56-
# force official to be true if an official branch. Otherwise respect the official parameter.
57-
${{ if or(eq(variables.OfficialBranch, true), eq(parameters.forceOfficial, true)) }}:
58-
value: 'v1/1ES.Official.PipelineTemplate.yml@1es'
59-
${{ else }}:
60-
value: 'v1/1ES.Unofficial.PipelineTemplate.yml@1es'
6137

6238
extends:
63-
template: ${{ variables['1ESTemplate'] }}
39+
template: v1/1ES.Official.PipelineTemplate.yml@1es
6440
parameters:
6541
pool:
6642
name: 1es-pool-azfunc
@@ -83,9 +59,7 @@ extends:
8359
- template: /eng/ci/templates/official/jobs/build-artifacts-windows.yml@self
8460
- template: /eng/ci/templates/official/jobs/build-artifacts-linux.yml@self
8561

86-
# tests are always ran for official branches
8762
- stage: Test
88-
condition: ${{ or(eq(variables.OfficialBranch, true), eq(parameters.runTests, true)) }}
8963
dependsOn: ''
9064

9165
jobs:

eng/ci/templates/official/jobs/build-artifacts-windows.yml

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,12 @@ jobs:
5353
**/ExtensionsMetadataGenerator.csproj
5454
**/WebJobs.Script.Abstractions.csproj
5555
56-
- ${{ if eq(variables.SignFiles, true) }}:
57-
- template: ci/sign-files.yml@eng
58-
parameters:
59-
displayName: Sign Abstractions assemblies
60-
folderPath: out/bin/WebJobs.Script.Abstractions/release
61-
pattern: Microsoft.Azure.WebJobs.Script.Abstractions*.dll
62-
signType: dll
56+
- template: ci/sign-files.yml@eng
57+
parameters:
58+
displayName: Sign Abstractions assemblies
59+
folderPath: out/bin/WebJobs.Script.Abstractions/release
60+
pattern: Microsoft.Azure.WebJobs.Script.Abstractions*.dll
61+
signType: dll
6362

6463
- task: DotNetCoreCLI@2
6564
displayName: Pack Abstractions
@@ -70,13 +69,12 @@ jobs:
7069
projects: |
7170
**/WebJobs.Script.Abstractions.csproj
7271
73-
- ${{ if eq(variables.SignFiles, true) }}:
74-
- template: ci/sign-files.yml@eng
75-
parameters:
76-
displayName: Sign ExtensionsMetadataGenerator assemblies
77-
folderPath: out/bin/ExtensionsMetadataGenerator
78-
pattern: Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator*.dll
79-
signType: dll-strong-name
72+
- template: ci/sign-files.yml@eng
73+
parameters:
74+
displayName: Sign ExtensionsMetadataGenerator assemblies
75+
folderPath: out/bin/ExtensionsMetadataGenerator
76+
pattern: Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator*.dll
77+
signType: dll-strong-name
8078

8179
- task: DotNetCoreCLI@2
8280
displayName: Pack ExtensionsMetadataGenerator
@@ -87,20 +85,19 @@ jobs:
8785
projects: |
8886
**/ExtensionsMetadataGenerator.csproj
8987
90-
- ${{ if eq(variables.SignFiles, true) }}:
91-
- template: ci/sign-files.yml@eng
92-
parameters:
93-
displayName: Sign NugetPackages
94-
folderPath: $(nuget_package_path)
95-
pattern: '*.nupkg'
96-
signType: nuget
88+
- template: ci/sign-files.yml@eng
89+
parameters:
90+
displayName: Sign NugetPackages
91+
folderPath: $(nuget_package_path)
92+
pattern: '*.nupkg'
93+
signType: nuget
9794

98-
- task: DeleteFiles@1
99-
displayName: Delete CodeSignSummary files
100-
inputs:
101-
contents: '**/CodeSignSummary-*.md'
95+
- task: DeleteFiles@1
96+
displayName: Delete CodeSignSummary files
97+
inputs:
98+
contents: '**/CodeSignSummary-*.md'
10299

103-
- task: DeleteFiles@1
104-
displayName: Delete CodeSignSummary files
105-
inputs:
106-
contents: '$(nuget_package_path)/**/CodeSignSummary-*.md'
100+
- task: DeleteFiles@1
101+
displayName: Delete CodeSignSummary files
102+
inputs:
103+
contents: '$(nuget_package_path)/**/CodeSignSummary-*.md'

0 commit comments

Comments
 (0)