@@ -442,10 +442,10 @@ stages:
442442 TCPConnectionString : $(AZURE_DB_TCP_CONN_STRING)
443443 NPConnectionString : $(AZURE_DB_NP_CONN_STRING)
444444 AADAuthorityURL : $(AADAuthorityURL)
445- # Note: Using the isFork variable to determine if secrets are available is not ideal since
446- # it's an indirect association. But everything else (referencing secret variables various
447- # ways to detect if they were present) won't run consistently across forks and non-forks .
448- ${{ if eq(variables['system.pullRequest.isFork '], 'False') }} :
445+ # Pipeline runs against forks of the repo don't have access to Library secrets, so we
446+ # omit them entirely from the configProperties, which causes the dependent tests to be
447+ # skipped .
448+ ${{ if eq(variables['System.PullRequest.IsFork '], 'False') }} :
449449 AADPasswordConnectionString : $(AAD_PASSWORD_CONN_STR)
450450 AADServicePrincipalSecret : $(AADServicePrincipalSecret)
451451 AADServicePrincipalId : $(AADServicePrincipalId)
@@ -474,7 +474,7 @@ stages:
474474 TCPConnectionString : $(AZURE_DB_TCP_CONN_STRING_eastus)
475475 NPConnectionString : $(AZURE_DB_NP_CONN_STRING_eastus)
476476 AADAuthorityURL : $(AADAuthorityURL)
477- ${{ if eq(variables['system.pullRequest.isFork '], 'False') }} :
477+ ${{ if eq(variables['System.PullRequest.IsFork '], 'False') }} :
478478 AADPasswordConnectionString : $(AAD_PASSWORD_CONN_STR_eastus)
479479 AADServicePrincipalSecret : $(AADServicePrincipalSecret)
480480 AADServicePrincipalId : $(AADServicePrincipalId)
@@ -529,7 +529,7 @@ stages:
529529 TCPConnectionString : $(AZURE_DB_TCP_CONN_STRING)
530530 NPConnectionString : $(AZURE_DB_NP_CONN_STRING)
531531 AADAuthorityURL : $(AADAuthorityURL)
532- ${{ if eq(variables['system.pullRequest.isFork '], 'False') }} :
532+ ${{ if eq(variables['System.PullRequest.IsFork '], 'False') }} :
533533 AADPasswordConnectionString : $(AAD_PASSWORD_CONN_STR)
534534 AADServicePrincipalSecret : $(AADServicePrincipalSecret)
535535 AADServicePrincipalId : $(AADServicePrincipalId)
@@ -565,9 +565,9 @@ stages:
565565
566566 # Enclave tests
567567 #
568- # Only run the AE tests if enable and if we have access to the necessary
569- # secrets.
570- ${{ if and(eq(parameters.runAlwaysEncryptedTests, true), eq(variables['system.pullRequest.isFork '], 'False')) }} :
568+ # Only run these tests if explicitly enabled, and if we're not a forked repo (which won't
569+ # have access to the necessary Library secrets) .
570+ ${{ if and(eq(parameters.runAlwaysEncryptedTests, true), eq(variables['System.PullRequest.IsFork '], 'False')) }} :
571571 windows_enclave_sql :
572572 pool : ADO-CI-AE-1ES-Pool
573573 images :
@@ -588,8 +588,7 @@ stages:
588588 EnclaveEnabled : true
589589 AADAuthorityURL : $(AADAuthorityURL)
590590 AADServicePrincipalId : $(AADServicePrincipalId)
591- ${{ if eq(variables['system.pullRequest.isFork'], 'False') }} :
592- AADServicePrincipalSecret : $(AADServicePrincipalSecret)
591+ AADServicePrincipalSecret : $(AADServicePrincipalSecret)
593592 AzureKeyVaultUrl : $(AzureKeyVaultUrl)
594593 AzureKeyVaultTenantId : $(AzureKeyVaultTenantId)
595594 SupportsIntegratedSecurity : $(SupportsIntegratedSecurity)
@@ -617,8 +616,7 @@ stages:
617616 TCPConnectionStringAASSGX : $(SQL_TCP_CONN_STRING_AASSGX)
618617 EnclaveEnabled : true
619618 AADServicePrincipalId : $(AADServicePrincipalId)
620- ${{ if eq(variables['system.pullRequest.isFork'], 'False') }} :
621- AADServicePrincipalSecret : $(AADServicePrincipalSecret)
619+ AADServicePrincipalSecret : $(AADServicePrincipalSecret)
622620 AzureKeyVaultUrl : $(AzureKeyVaultUrl)
623621 AzureKeyVaultTenantId : $(AzureKeyVaultTenantId)
624622 SupportsIntegratedSecurity : false
0 commit comments