Merge pull request #458 from lemeurherve/fixup-refacto

chore(tests) fixup build to pass Windows version image tag as build arg for Pester docker tests

Author: dduportal

build.ps1

@@ -96,9 +96,11 @@ Invoke-Expression "$baseDockerCmd config --services" 2>$null | ForEach-Object {
 
     $baseImage = "${windowsType}-${windowsVersion}"
     $versionTag = "${RemotingVersion}-${BuildNumber}-${image}"
+    Write-Host "= PREPARE: Preparing image ${image}, versionTag ${versionTag}"
     $tags = @( $image, $versionTag )
     if($jdkMajorVersion -eq "$defaultJdk") {
         $tags += $baseImage
+        Write-Host "= PREPARE: Bare image tag ${baseImage}"
     }
 
     $builds[$image] = @{
@@ -183,7 +185,7 @@ if($target -eq "test") {
     if(![System.String]::IsNullOrWhiteSpace($Build) -and $builds.ContainsKey($Build)) {
         Test-Image $Build
     } else {
-        Write-Host "= TEST: Testing all images"
+        Write-Host "= TEST: Testing all images..."
         foreach($image in $builds.Keys) {
             Test-Image $image
         }

tests/agent.Tests.ps1

@@ -3,6 +3,7 @@ Import-Module -DisableNameChecking -Force $PSScriptRoot/test_helpers.psm1
 $global:AGENT_IMAGE = Get-EnvOrDefault 'AGENT_IMAGE' ''
 $global:IMAGE_FOLDER = Get-EnvOrDefault 'IMAGE_FOLDER' ''
 $global:VERSION = Get-EnvOrDefault 'VERSION' ''
+$global:WINDOWS_VERSION_TAG = Get-EnvOrDefault 'WINDOWS_VERSION_TAG' ''
 
 $items = $global:AGENT_IMAGE.Split("-")
 
@@ -126,7 +127,7 @@ Describe "[$global:AGENT_IMAGE] can be built with custom build arguments" {
     BeforeAll {
         Push-Location -StackName 'agent' -Path "$PSScriptRoot/.."
 
-        $exitCode, $stdout, $stderr = Run-Program 'docker' "build --build-arg `"VERSION=${global:TEST_VERSION}`" --build-arg `"user=${global:TEST_USER}`" --build-arg `"AGENT_WORKDIR=${global:TEST_AGENT_WORKDIR}`" -t ${global:AGENT_IMAGE} ${global:IMAGE_FOLDER}"
+        $exitCode, $stdout, $stderr = Run-Program 'docker' "build --build-arg `"VERSION=${global:TEST_VERSION}`" --build-arg `"WINDOWS_VERSION_TAG=${global:WINDOWS_VERSION_TAG}`" --build-arg `"user=${global:TEST_USER}`" --build-arg `"AGENT_WORKDIR=${global:TEST_AGENT_WORKDIR}`" -t ${global:AGENT_IMAGE} ${global:IMAGE_FOLDER}"
         $exitCode | Should -Be 0
 
         docker run -d -it --name "$global:CONTAINERNAME" -P "$global:AGENT_IMAGE" "$global:CONTAINERSHELL"

tests/test_helpers.psm1

@@ -115,7 +115,7 @@ function Run-Program($cmd, $params) {
     $stderr = $proc.StandardError.ReadToEnd()
     $proc.WaitForExit()
     if($proc.ExitCode -ne 0) {
-        Write-Host "`n`nstdout:`n$stdout`n`nstderr:`n$stderr`n$cmd`n`nparams:`n$param`n`n"
+        Write-Host "`n`nstdout:`n$stdout`n`nstderr:`n$stderr`n`ncmd:`n$cmd`n`nparams:`n$param`n`n"
     }
 
     return $proc.ExitCode, $stdout, $stderr

updatecli/updatecli.d/jdk11.yaml

@@ -54,9 +54,9 @@ conditions:
         - arm/v7
       image: eclipse-temurin
       tag: '{{source "lastVersion" }}-jdk-focal'
-  checkTemurinNanocore2019DockerImage:
+  checkTemurinNanoserver2019DockerImage:
     kind: dockerimage
-    name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-windowsservercore-1809" is available
+    name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-nanoserver-1809" is available
     disablesourceinput: true
     spec:
       architecture: amd64
@@ -82,15 +82,15 @@ targets:
       replacepattern: >-
         variable${1}"JAVA11_VERSION"${2}{${3}${4}${5}default${6}= "{{ source "lastVersion" }}"
     scmid: default
-  setJDK11VersionWindowsNanoserver1809:
-    name: "Bump JDK11 version on Windows Nanoserver 1809 image"
+  setJDK11VersionWindowsNanoserver:
+    name: "Bump JDK11 version on Windows Nanoserver image"
     kind: yaml
     spec:
       file: build-windows.yaml
       key: $.services.jdk11-nanoserver.build.args.JAVA_VERSION
     scmid: default
-  setJDK11VersionWindowsServerLtsc2019:
-    name: "Bump JDK11 version on Windows Server LTSC 2019 image"
+  setJDK11VersionWindowsServer:
+    name: "Bump JDK11 version on Windows Server image"
     kind: yaml
     spec:
       file: build-windows.yaml

updatecli/updatecli.d/jdk17.yaml

@@ -54,9 +54,9 @@ conditions:
         - arm/v7
       image: eclipse-temurin
       tag: '{{source "lastVersion" }}-jdk-focal'
-  checkTemurinNanocore2019DockerImage:
+  checkTemurinNanoserver2019DockerImage:
     kind: dockerimage
-    name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-windowsservercore-1809" is available
+    name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-nanoserver-1809" is available
     disablesourceinput: true
     spec:
       architecture: amd64
@@ -100,15 +100,15 @@ targets:
         keyword: ARG
         matcher: JAVA_VERSION
     scmid: default
-  setJDK17VersionWindowsNanoserver1809:
-    name: "Bump JDK17 version on Windows Nanoserver 1809 image"
+  setJDK17VersionWindowsNanoserver:
+    name: "Bump JDK17 version on Windows Nanoserver image"
     kind: yaml
     spec:
       file: build-windows.yaml
       key: $.services.jdk17-nanoserver.build.args.JAVA_VERSION
     scmid: default
-  setJDK17VersionWindowsServerLtsc2019:
-    name: "Bump JDK17 version on Windows Server LTSC 2019 image"
+  setJDK17VersionWindowsServer:
+    name: "Bump JDK17 version on Windows Server image"
     kind: yaml
     spec:
       file: build-windows.yaml