Merged PR 600034: Undo removal of buildxl credential provider

Re-add the old credential provider into the RunCheckInTestsWithPAT script while leaving the azure credential provider (to fix authentication issues during bootstrapping process). This will help fix some PartB validation pipeline failures that have been happening.

Related work items: #1819575
This commit is contained in:
Pasindu Gunasekara 2021-02-26 20:14:00 +00:00
Родитель f93605f279
Коммит c874f9a673
3 изменённых файлов: 12 добавлений и 1 удалений

Просмотреть файл

@ -10,7 +10,11 @@
[Parameter(mandatory=$true)]
[String]$args
)
[Environment]::SetEnvironmentVariable("1ESSHAREDASSETS_BUILDXL_FEED_PAT", $1esPat, "Process")
[Environment]::SetEnvironmentVariable("CLOUDBUILD_BUILDXL_SELFHOST_FEED_PAT", $cbPat, "Process")
[Environment]::SetEnvironmentVariable("MSENG_GIT_PAT", $msEngGitPat, "Process")
[Environment]::SetEnvironmentVariable("NUGET_CREDENTIALPROVIDERS_PATH", $ncPath, "Process")
[Environment]::SetEnvironmentVariable("VSS_NUGET_EXTERNAL_FEED_ENDPOINTS", "
{
'endpointCredentials': [

Просмотреть файл

@ -111,6 +111,11 @@ REM *********************************
set BUILDXL_LKG_FEED_1=
set _BUILDXL_INIT_HASH=%_BUILDXL_INIT_HASH_NEW%
REM We'll conditionally set the credential provider if not set on the machine.
REM If not set we will set it to the local one in the enlistment but iwth the b-drive substitution
if NOT DEFINED NUGET_CREDENTIALPROVIDERS_PATH (
set NUGET_CREDENTIALPROVIDERS_PATH=%TOOLROOT%
)
goto :EOF

Просмотреть файл

@ -541,7 +541,9 @@ Log -NoNewline "Building using the ";
Log-Emphasis -NoNewline $($useDeployment.description)
Log " version of BuildXL.";
$AdditionalBuildXLArguments += "/environment:$($useDeployment.telemetryEnvironment)";
$Nuget_CredentialProviders_Path = [Environment]::GetEnvironmentVariable("NUGET_CREDENTIALPROVIDERS_PATH");
$AdditionalBuildXLArguments += "/environment:$($useDeployment.telemetryEnvironment) /unsafe_GlobalUntrackedScopes:$Nuget_CredentialProviders_Path /unsafe_GlobalPassthroughEnvVars:NUGET_CREDENTIALPROVIDERS_PATH";
$GenerateCgManifestFilePath = "$NormalizationDrive\cg\nuget\cgmanifest.json";
$AdditionalBuildXLArguments += "/generateCgManifestForNugets:$GenerateCgManifestFilePath";