Skip to content

[Main][Task]28736784: Update Cfg CDN SetActive Scripts for Nightly Build #2408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Karlie-777 merged 2 commits into from
Sep 11, 2024
Merged

[Main][Task]28736784: Update Cfg CDN SetActive Scripts for Nightly Build #2408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34cfffe
update
Karlie-777 Sep 10, 2024
a8d3b05
Merge branch 'main' into karlie/fixcfgnightly
Karlie-777 Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions tools/config/scripts/listAzCdnVersions.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ Function Get-AllVersionFiles(
Get-VersionFiles $files "$storagePath" "ai.config." $null
}

Function Get-AllTestVersionFiles(
[system.collections.generic.dictionary[string, system.collections.generic.list[hashtable]]] $files,
[string] $storagePath
) {
Get-VersionFiles $files "$storagePath" "ai_test.config." $null
}

$Error.Clear()

#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -96,15 +103,20 @@ if ([string]::IsNullOrWhiteSpace($container) -eq $true) {
Get-AllVersionFiles $files "scripts/b"
Get-AllVersionFiles $files "beta"
Get-AllVersionFiles $files "next"
Get-AllVersionFiles $files "dev"
Get-AllVersionFiles $files "nightly"
#Get-AllVersionFiles $files "dev"
Get-AllTestVersionFiles $files "dev"
# Get-AllVersionFiles $files "nightly"
Get-AllTestVersionFiles $files "nightly"
}

if ([string]::IsNullOrWhiteSpace($container) -ne $true) {
if ($container -eq "public") {
Get-AllVersionFiles $files "scripts/b"
} elseif ($container -eq "beta" -or $container -eq "next" -or $container -eq "dev" -or $container -eq "nightly") {
} elseif ($container -eq "beta" -or $container -eq "next") {
Get-AllVersionFiles $files "$container"
} elseif ($container -eq "dev" -or $container -eq "nightly") {
# Get-AllVersionFiles $files "$container"
Get-AllTestVersionFiles $files "$container"
} else {
$global:connectDetails.testOnly = $true
$global:connectDetails.storeContainer = "tst"
Expand Down
15 changes: 13 additions & 2 deletions tools/config/scripts/setAzActiveCdnVersion.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ Write-Log "=====================================================================

# List the files for each container
$files = New-Object 'system.collections.generic.dictionary[string, system.collections.generic.list[hashtable]]'
$testFiles = New-Object 'system.collections.generic.dictionary[string, system.collections.generic.list[hashtable]]'

$storePath = "$container"
if ($container -eq "public") {
Expand All @@ -145,8 +146,13 @@ if ($container -eq "public") {
}

Get-VersionFiles $files $storePath "ai.config." $activeVersion
Get-VersionFiles $testFiles $storePath "ai_test.config." $activeVersion

if ($files.ContainsKey($activeVersion) -ne $true) {
if ($container -eq "dev" -or $container -eq "nightly") {
if ($testFiles.ContainsKey($activeVersion) -ne $true) {
Write-LogFailure "Test Version [$activeVersion] does not appear to be deployed to [$container]"
}
} elseif ($files.ContainsKey($activeVersion) -ne $true) {
Write-LogFailure "Version [$activeVersion] does not appear to be deployed to [$container]"
} elseif ($files[$activeVersion].Count -ne 1) { # Since 2.6.5
Write-LogFailure "Version [$activeVersion] does not fully deployed to [$container] -- only found [$($files[$activeVersion].Count)] file(s)"
Expand All @@ -157,6 +163,11 @@ if (Get-HasErrors -eq $true) {
exit 2
}

SetActiveVersion $files[$activeVersion] $storePath $minorOnly
if ($container -eq "dev" -or $container -eq "nightly") {
SetActiveVersion $testFiles[$activeVersion] $storePath $minorOnly
} else {
SetActiveVersion $files[$activeVersion] $storePath $minorOnly
}


Write-Log "======================================================================"