Skip to content

Commit 1e4f08b

Browse files
authored
migrate esrp signing (#1438)
1 parent 8303eae commit 1e4f08b

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

.pipelines/azure_pipeline_mergedbranches.yaml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ variables:
2424
IS_RELEASE: $[ne(variables['TELEMETRY_TAG'], '')]
2525
appRegistrationClientId: $[variables['APP_REGISTRATION_CLIENT_ID']]
2626
appRegistrationTenantId: $[variables['APP_REGISTRATION_TENANT_ID']]
27+
esrpClientId: $[variables['ESRP_CLIENT_ID']]
2728
authAKVName: $[variables['AUTH_AKV_NAME']]
2829
authCertName: $[variables['AUTH_CERT_NAME']]
2930
authSignCertName: $[variables['AUTH_SIGN_CERT_NAME']]
@@ -69,6 +70,7 @@ jobs:
6970
7071
echo "appRegistrationClientId is $APP_REGISTRATION_CLIENT_ID"
7172
echo "appRegistrationTenantId is $APP_REGISTRATION_TENANT_ID"
73+
echo "esrpClientId is $ESRP_CLIENT_ID"
7274
echo "authAKVName is $AUTH_AKV_NAME"
7375
echo "authCertName is $AUTH_CERT_NAME"
7476
echo "authSignCertName is $AUTH_SIGN_CERT_NAME"
@@ -223,9 +225,11 @@ jobs:
223225
- task: EsrpCodeSigning@5
224226
condition: eq(variables.IS_PR, false)
225227
inputs:
226-
ConnectedServiceName: 'AME ESRPContainerInsights MSI Service Connection'
228+
ConnectedServiceName: 'AME ESRPContainerInsights MSI FIC'
229+
UseMSIAuthentication: true
227230
AppRegistrationClientId: $(appRegistrationClientId)
228231
AppRegistrationTenantId: $(appRegistrationTenantId)
232+
EsrpClientId: $(esrpClientId)
229233
AuthAKVName: $(authAKVName)
230234
AuthCertName: $(authCertName)
231235
AuthSignCertName: $(authSignCertName)
@@ -484,9 +488,11 @@ jobs:
484488

485489
- task: EsrpCodeSigning@5
486490
inputs:
487-
ConnectedServiceName: 'AME ESRPContainerInsights MSI Service Connection'
491+
ConnectedServiceName: 'AME ESRPContainerInsights MSI FIC'
492+
UseMSIAuthentication: true
488493
AppRegistrationClientId: $(appRegistrationClientId)
489494
AppRegistrationTenantId: $(appRegistrationTenantId)
495+
EsrpClientId: $(esrpClientId)
490496
AuthAKVName: $(authAKVName)
491497
AuthCertName: $(authCertName)
492498
AuthSignCertName: $(authSignCertName)
@@ -523,9 +529,11 @@ jobs:
523529

524530
- task: EsrpCodeSigning@5
525531
inputs:
526-
ConnectedServiceName: 'AME ESRPContainerInsights MSI Service Connection'
532+
ConnectedServiceName: 'AME ESRPContainerInsights MSI FIC'
533+
UseMSIAuthentication: true
527534
AppRegistrationClientId: $(appRegistrationClientId)
528535
AppRegistrationTenantId: $(appRegistrationTenantId)
536+
EsrpClientId: $(esrpClientId)
529537
AuthAKVName: $(authAKVName)
530538
AuthCertName: $(authCertName)
531539
AuthSignCertName: $(authSignCertName)
@@ -718,9 +726,11 @@ jobs:
718726

719727
- task: EsrpCodeSigning@5
720728
inputs:
721-
ConnectedServiceName: 'AME ESRPContainerInsights MSI Service Connection'
729+
ConnectedServiceName: 'AME ESRPContainerInsights MSI FIC'
730+
UseMSIAuthentication: true
722731
AppRegistrationClientId: $(appRegistrationClientId)
723732
AppRegistrationTenantId: $(appRegistrationTenantId)
733+
EsrpClientId: $(esrpClientId)
724734
AuthAKVName: $(authAKVName)
725735
AuthCertName: $(authCertName)
726736
AuthSignCertName: $(authSignCertName)
@@ -757,9 +767,11 @@ jobs:
757767

758768
- task: EsrpCodeSigning@5
759769
inputs:
760-
ConnectedServiceName: 'AME ESRPContainerInsights MSI Service Connection'
770+
ConnectedServiceName: 'AME ESRPContainerInsights MSI FIC'
771+
UseMSIAuthentication: true
761772
AppRegistrationClientId: $(appRegistrationClientId)
762773
AppRegistrationTenantId: $(appRegistrationTenantId)
774+
EsrpClientId: $(esrpClientId)
763775
AuthAKVName: $(authAKVName)
764776
AuthCertName: $(authCertName)
765777
AuthSignCertName: $(authSignCertName)
@@ -915,9 +927,11 @@ jobs:
915927
- task: EsrpCodeSigning@5
916928
condition: eq(variables.IS_PR, false)
917929
inputs:
918-
ConnectedServiceName: 'AME ESRPContainerInsights MSI Service Connection'
930+
ConnectedServiceName: 'AME ESRPContainerInsights MSI FIC'
931+
UseMSIAuthentication: true
919932
AppRegistrationClientId: $(appRegistrationClientId)
920933
AppRegistrationTenantId: $(appRegistrationTenantId)
934+
EsrpClientId: $(esrpClientId)
921935
AuthAKVName: $(authAKVName)
922936
AuthCertName: $(authCertName)
923937
AuthSignCertName: $(authSignCertName)

0 commit comments

Comments
 (0)