Skip to content

Add 1903 build based on 1809 #239

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
merged 6 commits into from
Jul 1, 2019
Merged

Add 1903 build based on 1809 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5fbbdaa
add 1903 build based on 1809
TravisEz13 Jun 30, 2019
0a6ebb9
remove from wsc and nanoserver 1709 and add 1903 to wsc
TravisEz13 Jun 30, 2019
32f3a86
internal fixes
TravisEz13 Jun 30, 2019
6516891
fix breaking changes to tag format
TravisEz13 Jun 30, 2019
e737b97
Only test 1809 because 1903 is not available.
TravisEz13 Jun 30, 2019
90c2de7
update manifest list generation
TravisEz13 Jul 1, 2019
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
12 changes: 6 additions & 6 deletions createAllManifests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,28 @@ $createScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'createManifest.ps1


$latestStableUbuntu = "ubuntu-bionic"
$latestStableWsc1709 = "windowsservercore-1709"
$latestStableWscLtsc = "windowsservercore-latest"
$latestStableWsc1803 = "windowsservercore-1803"
$latestStableWsc1809 = "windowsservercore-1809"
$latestStableNano1709 = "nanoserver-1709"
$latestStableWsc1903 = "windowsservercore-1903"
$latestStableNano1803 = "nanoserver-1803"
$latestStableNano1809 = "nanoserver-1809"
$latestStableNano1903 = "nanoserver-1903"

$latestPreviewUbuntu = "preview-ubuntu-bionic"
$latestPreviewWsc1709 = "preview-windowsservercore-1709"
$latestPreviewWscLtsc = "preview-windowsservercore-latest"
$latestPreviewWsc1803 = "preview-windowsservercore-1803"
$latestPreviewWsc1809 = "preview-windowsservercore-1809"
$latestPreviewWsc1903 = "preview-windowsservercore-1809"

switch ($Channel)
{
'preview' {
&$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1709, $latestPreviewWscLtsc, $latestPreviewWsc1803, $latestPreviewWsc1809 -ManifestTag 'preview'
&$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1903, $latestPreviewWscLtsc, $latestPreviewWsc1803, $latestPreviewWsc1809 -ManifestTag 'preview'
}

'stable' {
&$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1709, $latestStableWscLtsc, $latestStableWsc1803, $latestStableWsc1809 -ManifestTag 'latest'
&$createScriptPath -ContainerRegistry $Registry -taglist $latestStableNano1709, $latestStableNano1803, $latestStableNano1809 -ManifestTag 'nanoserver'
&$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1903, $latestStableWscLtsc, $latestStableWsc1803, $latestStableWsc1809 -ManifestTag 'latest'
&$createScriptPath -ContainerRegistry $Registry -taglist $latestStableNano1903, $latestStableNano1803, $latestStableNano1809 -ManifestTag 'nanoserver'
}
}
1 change: 0 additions & 1 deletion release/preview/nanoserver/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
"osVersion": "Nano Server, version ${fromTag}",
"shortTags": [
{"Tag": "1709"},
{"Tag": "1803"}
],
"tagTemplates": [
Expand Down
3 changes: 2 additions & 1 deletion release/preview/nanoserver1809/getLatestTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath
$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
Import-Module $modulePath

Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}_KB\d{7}(_amd64)?$' -Mcr
Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr

3 changes: 2 additions & 1 deletion release/preview/nanoserver1809/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
"osVersion": "Nano Server, version ${fromTag}",
"shortTags": [
{"Tag": "1809"}
{"Tag": "1809"},
{"Tag": "1903"}
],
"tagTemplates": [
"#psversion#-nanoserver-#tag#",
Expand Down
4 changes: 2 additions & 2 deletions release/preview/windowsservercore/getLatestTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
Import-Module $modulePath -Force

# The versions of nanoserver we care about
$shortTags = @('1709','1803','1809')
$shortTags = @('1803','1809','1903')

Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}_KB\d{7}' -Mcr
Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
1 change: 0 additions & 1 deletion release/stable/nanoserver/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
"osVersion": "Nano Server, version ${fromTag}",
"shortTags": [
{"Tag": "1709"},
{"Tag": "1803"}
],
"tagTemplates": [
Expand Down
9 changes: 2 additions & 7 deletions release/stable/nanoserver1809/getLatestTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,5 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath
$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
Import-Module $modulePath

if($CI.IsPresent)
{
Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '^1809$' -Mcr
}
else {
Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}_KB\d{7}(_amd64)?$' -Mcr
}
Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr

3 changes: 2 additions & 1 deletion release/stable/nanoserver1809/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
"osVersion": "Nano Server, version ${fromTag}",
"shortTags": [
{"Tag": "1809"}
{"Tag": "1809"},
{"Tag": "1903"}
],
"tagTemplates": [
"#psversion#-nanoserver-#tag#",
Expand Down
4 changes: 2 additions & 2 deletions release/stable/windowsservercore/getLatestTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
Import-Module $modulePath -Force

# The versions of nanoserver we care about
$shortTags = @('1709','1803','1809')
$shortTags = @('1803','1809','1903')

Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}_KB\d{7}' -Mcr
Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
9 changes: 8 additions & 1 deletion tools/getDockerTags/getDockerTags.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
function Get-DockerTagsList
{
param(
[Parameter(Mandatory)]
[string] $Url,
[Parameter(Mandatory)]
[ValidateSet('name', 'tags')]
[string] $PropertyName
)
Expand All @@ -26,6 +28,10 @@ function Get-DockerTagsList
$results.$propertyName | ForEach-Object {Write-Output $_}
$nextUrl = $null
}
else
{
$nextUrl = $null
}
}
}
catch
Expand Down Expand Up @@ -149,5 +155,6 @@ function Get-DockerTags
}

Export-ModuleMember -Function @(
'Get-DockerTags'
'Get-DockerTags',
'Get-DockerTagsList'
)
2 changes: 1 addition & 1 deletion vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
imagename: nanoserver1809
vmImage: windows-2019
preview: false
ciParameter: '-CI'
ciParameter: '-CI -TagFilter 1809'
continueonerror: false

# Use the TagFilter to filter to 1809 because the docker instance inside the agent only supports 1809
Expand Down