Merge pull request #235 from StefanScherer/ignore-win7-in-tests

Skip windows_7.json in test
StefanScherer · Dec 29, 2019 · 53d7709 · 53d7709
2 parents cb732c6 + 9f53bb4
commit 53d7709
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/windows:ltsc2019 AS makeiso
+FROM mcr.microsoft.com/windows:1809 AS makeiso
 WORKDIR C:/source
 COPY . .
 RUN powershell -NoProfile -ExecutionPolicy unrestricted -file make_unattend_iso.ps1
 
-FROM mcr.microsoft.com/windowsservercore:ltsc2019
+FROM mcr.microsoft.com/windows/servercore:ltsc2019
 ENV chocolateyUseWindowsCompression false
 
 RUN powershell -NoProfile -ExecutionPolicy unrestricted -Command \

diff --git a/test.ps1 b/test.ps1
@@ -10,7 +10,7 @@ $env:PACKER_AZURE_RESOURCE_GROUP="dummy"
 $env:PACKER_AZURE_STORAGE_ACCOUNT="dummy"
 $env:AWS_S3_BUCKET="dummy"
 
-$files = @(Get-ChildItem *.json)
+$files = @(Get-ChildItem *.json | Where-Object -FilterScript { $_.Name -ne "windows_7.json" })
 
 foreach ($file in $files) {
   Write-Host "`n`nValidate $file"