Skip to content

Add 1909 images #333

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
TravisEz13 merged 4 commits into from
Feb 7, 2020
Merged

Add 1909 images #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ae2015
Add 1909 images
TravisEz13 Nov 12, 2019
64af1ef
Add acr based images for windows
TravisEz13 Nov 12, 2019
e53a6b1
Don't test behavior on ACR
TravisEz13 Feb 7, 2020
26e0ee2
Fix logic
TravisEz13 Feb 7, 2020
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
9 changes: 8 additions & 1 deletion .vsts-ci/phase.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,14 @@ jobs:
condition: and( succeededOrFailed(), ne(variables['Channel'],''))

- pwsh: |
./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-$(Channel)' ${{ parameters.ciParameter }} -Repository $(Channel)/powershell
$extraParams = @{}
if($env:ACR_NAME)
{
Write-Host 'Using ACR, will NOT test behavior...'
$extraParams.Add('SkipTest',$true)
}

./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-$(Channel)' @extraParams ${{ parameters.ciParameter }} -Repository $(Channel)/powershell
displayName: $(ImageName) $(Channel)
condition: and( succeededOrFailed(), ne(variables['Channel'],''))
continueOnError: ${{ variables.continueonerror }}
Expand Down
1 change: 0 additions & 1 deletion .vsts-ci/vsts-arm-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ stages:
acr: OnlyAcr
useacr: true
winCiParameter: ''
osFilter: Linux
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 @@ -4,7 +4,8 @@
"osVersion": "Nano Server, version ${fromTag}",
"shortTags": [
{"Tag": "1809"},
{"Tag": "1903"}
{"Tag": "1903"},
{"Tag": "1909"}
],
"tagTemplates": [
"#psversion#-nanoserver-#tag#",
Expand Down
2 changes: 1 addition & 1 deletion 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 = @('1803','1809','1903')
$shortTags = @('1803','1809','1903','1909')

Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -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 @@ -4,7 +4,8 @@
"osVersion": "Nano Server, version ${fromTag}",
"shortTags": [
{"Tag": "1809"},
{"Tag": "1903"}
{"Tag": "1903"},
{"Tag": "1909"}
],
"tagTemplates": [
"#psversion#-nanoserver-#tag#",
Expand Down
2 changes: 1 addition & 1 deletion 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 = @('1803','1809','1903')
$shortTags = @('1803','1809','1903','1909')

Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr