move Test-Image function higher

Author: lemeurherve

make.ps1

@@ -48,37 +48,6 @@ if([String]::IsNullOrWhiteSpace($env:WAR_URL)) {
     $env:WAR_URL = 'https://get.jenkins.io/{0}/{1}/jenkins.war' -f $releaseLine, $env:JENKINS_VERSION
 }
 
-$items = $ImageType.Split('-')
-$env:WINDOWS_FLAVOR = $items[0]
-$env:WINDOWS_VERSION = $items[1]
-
-# Retrieve the sha256 corresponding to the war file
-$warShaURL = '{0}.sha256' -f $env:WAR_URL
-$webClient = New-Object System.Net.WebClient
-$env:WAR_SHA = $webClient.DownloadString($warShaURL).Split(' ')[0]
-
-$env:COMMIT_SHA=$(git rev-parse HEAD)
-
-$baseDockerCmd = 'docker-compose --file=build-windows.yaml'
-$baseDockerBuildCmd = '{0} build --parallel --pull' -f $baseDockerCmd
-
-Write-Host "= PREPARE: List of $Organisation/$Repository images and tags to be processed:"
-Invoke-Expression "$baseDockerCmd config"
-
-if($target -eq 'build') {
-    Write-Host '= BUILD: Building all images...'
-    switch ($DryRun) {
-        $true { Write-Host "(dry-run) $baseDockerBuildCmd" }
-        $false { Invoke-Expression $baseDockerBuildCmd }
-    }
-    Write-Host '= BUILD: Finished building all images.'
-
-    if($lastExitCode -ne 0 -and !$DryRun) {
-        Write-Error "= BUILD: failed!"
-        exit $lastExitCode
-    }
-}
-
 function Test-Image {
     param (
         $ImageName
@@ -110,6 +79,37 @@ function Test-Image {
     return $failed
 }
 
+$items = $ImageType.Split('-')
+$env:WINDOWS_FLAVOR = $items[0]
+$env:WINDOWS_VERSION = $items[1]
+
+# Retrieve the sha256 corresponding to the war file
+$warShaURL = '{0}.sha256' -f $env:WAR_URL
+$webClient = New-Object System.Net.WebClient
+$env:WAR_SHA = $webClient.DownloadString($warShaURL).Split(' ')[0]
+
+$env:COMMIT_SHA=$(git rev-parse HEAD)
+
+$baseDockerCmd = 'docker-compose --file=build-windows.yaml'
+$baseDockerBuildCmd = '{0} build --parallel --pull' -f $baseDockerCmd
+
+Write-Host "= PREPARE: List of $Organisation/$Repository images and tags to be processed:"
+Invoke-Expression "$baseDockerCmd config"
+
+if($target -eq 'build') {
+    Write-Host '= BUILD: Building all images...'
+    switch ($DryRun) {
+        $true { Write-Host "(dry-run) $baseDockerBuildCmd" }
+        $false { Invoke-Expression $baseDockerBuildCmd }
+    }
+    Write-Host '= BUILD: Finished building all images.'
+
+    if($lastExitCode -ne 0 -and !$DryRun) {
+        Write-Error "= BUILD: failed!"
+        exit $lastExitCode
+    }
+}
+
 if($target -eq 'test') {
     if ($DryRun) {
         Write-Host '(dry-run) test'