-
-
Notifications
You must be signed in to change notification settings - Fork 175
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(windows): refactor
docker-ssh-agent build process like `docker…
…-agent` (#289) * chore(windows): refactor `docker-ssh-agent` build process like `docker-agent` * adapt jdk11 updatecli manifest * remove --interactive from tests
- Loading branch information
1 parent
518f9fe
commit 68ce94b
Showing
12 changed files
with
430 additions
and
359 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| services: | ||
| jdk11: | ||
| image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}-jdk11 | ||
| build: | ||
| context: ./ | ||
| dockerfile: ./windows/${WINDOWS_FLAVOR}/Dockerfile | ||
| args: | ||
| JAVA_HOME: "C:/openjdk-11" | ||
| JAVA_VERSION: 11.0.20_8 | ||
| WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG} | ||
| TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION} | ||
| tags: | ||
| - "${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}-jdk11" | ||
| - "${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}" | ||
| - "${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| [CmdletBinding()] | ||
| Param( | ||
| [Parameter(Position=1)] | ||
| [String] $Target = 'build', | ||
| [String] $Build = '', | ||
| [String] $VersionTag = '1.0-1', | ||
| [switch] $DryRun = $false | ||
| ) | ||
|
|
||
| $ErrorActionPreference = 'Stop' | ||
| $Repository = 'ssh-agent' | ||
| $Organisation = 'jenkins' | ||
| $ImageType = 'windows-ltsc2019' | ||
|
|
||
| if(![String]::IsNullOrWhiteSpace($env:DOCKERHUB_REPO)) { | ||
| $Repository = $env:DOCKERHUB_REPO | ||
| } | ||
|
|
||
| if(![String]::IsNullOrWhiteSpace($env:DOCKERHUB_ORGANISATION)) { | ||
| $Organisation = $env:DOCKERHUB_ORGANISATION | ||
| } | ||
|
|
||
| if(![String]::IsNullOrWhiteSpace($env:IMAGE_TYPE)) { | ||
| $ImageType = $env:IMAGE_TYPE | ||
| } | ||
|
|
||
| # Check for required commands | ||
| Function Test-CommandExists { | ||
| # From https://devblogs.microsoft.com/scripting/use-a-powershell-function-to-see-if-a-command-exists/ | ||
| Param ( | ||
| [String] $command | ||
| ) | ||
|
|
||
| $oldPreference = $ErrorActionPreference | ||
| $ErrorActionPreference = 'stop' | ||
| try { | ||
| if(Get-Command $command){ | ||
| Write-Debug "$command exists" | ||
| } | ||
| } | ||
| Catch { | ||
| "$command does not exist" | ||
| } | ||
| Finally { | ||
| $ErrorActionPreference=$oldPreference | ||
| } | ||
| } | ||
|
|
||
| # Ensure constant env vars used in the docker compose file are defined | ||
| $env:DOCKERHUB_ORGANISATION = "$Organisation" | ||
| $env:DOCKERHUB_REPO = "$Repository" | ||
| $env:VERSION = "$VersionTag" | ||
|
|
||
| $items = $ImageType.Split("-") | ||
| $env:WINDOWS_FLAVOR = $items[0] | ||
| $env:WINDOWS_VERSION_TAG = $items[1] | ||
| $env:TOOLS_WINDOWS_VERSION = $items[1] | ||
| if ($items[1] -eq 'ltsc2019') { | ||
| # There are no eclipse-temurin:*-ltsc2019 or mcr.microsoft.com/powershell:*-ltsc2019 docker images unfortunately, only "1809" ones | ||
| $env:TOOLS_WINDOWS_VERSION = '1809' | ||
| } | ||
|
|
||
| $ProgressPreference = 'SilentlyContinue' # Disable Progress bar for faster downloads | ||
|
|
||
| Test-CommandExists "docker" | ||
| Test-CommandExists "docker-compose" | ||
| Test-CommandExists "yq" | ||
|
|
||
| function Test-Image { | ||
| param ( | ||
| $ImageName | ||
| ) | ||
|
|
||
| $imageNameItems = $imageName.Split(":") | ||
| $imageTag = $imageNameItems[1] | ||
|
|
||
| Write-Host "= TEST: Testing ${ImageName} image" | ||
|
|
||
| $env:IMAGE_NAME = $ImageName | ||
|
|
||
| $targetPath = '.\target\{0}' -f $imageTag | ||
| if(Test-Path $targetPath) { | ||
| Remove-Item -Recurse -Force $targetPath | ||
| } | ||
| New-Item -Path $targetPath -Type Directory | Out-Null | ||
| # $configuration.Run.Path = 'tests\sshAgent.Tests.ps1' | ||
| $configuration.TestResult.OutputPath = '{0}\junit-results.xml' -f $targetPath | ||
| $TestResults = Invoke-Pester -Configuration $configuration | ||
| $failed = $false | ||
| if ($TestResults.FailedCount -gt 0) { | ||
| Write-Host "There were $($TestResults.FailedCount) failed tests out of $($TestResults.TotalCount) in ${ImageName}" | ||
| $failed = $true | ||
| } else { | ||
| Write-Host "There were $($TestResults.PassedCount) passed tests in ${ImageName}" | ||
| } | ||
| Remove-Item env:\IMAGE_NAME | ||
|
|
||
| return $failed | ||
| } | ||
|
|
||
| $baseDockerCmd = 'docker-compose --file=build-windows.yaml' | ||
| $baseDockerBuildCmd = '{0} build --parallel --pull' -f $baseDockerCmd | ||
|
|
||
| Write-Host "= PREPARE: List of $Organisation/$env:DOCKERHUB_REPO images and tags to be processed:" | ||
| Invoke-Expression "$baseDockerCmd config" | ||
|
|
||
| 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) { | ||
| exit $lastExitCode | ||
| } | ||
|
|
||
| if($target -eq "test") { | ||
| if ($DryRun) { | ||
| Write-Host "= TEST: (dry-run) test harness" | ||
| } else { | ||
| Write-Host "= TEST: Starting test harness" | ||
|
|
||
| $mod = Get-InstalledModule -Name Pester -MinimumVersion 5.3.0 -MaximumVersion 5.3.3 -ErrorAction SilentlyContinue | ||
| if($null -eq $mod) { | ||
| Write-Host "= TEST: Pester 5.3.x not found: installing..." | ||
| $module = "c:\Program Files\WindowsPowerShell\Modules\Pester" | ||
| if(Test-Path $module) { | ||
| takeown /F $module /A /R | ||
| icacls $module /reset | ||
| icacls $module /grant Administrators:'F' /inheritance:d /T | ||
| Remove-Item -Path $module -Recurse -Force -Confirm:$false | ||
| } | ||
| Install-Module -Force -Name Pester -MaximumVersion 5.3.3 | ||
| } | ||
|
|
||
| Import-Module Pester | ||
| Write-Host "= TEST: Setting up Pester environment..." | ||
| $configuration = [PesterConfiguration]::Default | ||
| $configuration.Run.PassThru = $true | ||
| $configuration.Run.Path = '.\tests' | ||
| $configuration.Run.Exit = $true | ||
| $configuration.TestResult.Enabled = $true | ||
| $configuration.TestResult.OutputFormat = 'JUnitXml' | ||
| $configuration.Output.Verbosity = 'Diagnostic' | ||
| $configuration.CodeCoverage.Enabled = $false | ||
|
|
||
| Write-Host "= TEST: Testing all ${agentType} images..." | ||
| # Only fail the run afterwards in case of any test failures | ||
| $testFailed = $false | ||
| Invoke-Expression "$baseDockerCmd config" | yq '.services[].image' | ForEach-Object { | ||
| $testFailed = $testFailed -or (Test-Image $_) | ||
| } | ||
|
|
||
| # Fail if any test failures | ||
| if($testFailed -ne $false) { | ||
| Write-Error "= TEST: stage failed!" | ||
| exit 1 | ||
| } else { | ||
| Write-Host "= TEST: stage passed!" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if($target -eq "publish") { | ||
| Write-Host "= PUBLISH: push all images and tags" | ||
| switch($DryRun) { | ||
| $true { Write-Host "(dry-run) $baseDockerCmd push" } | ||
| $false { Invoke-Expression "$baseDockerCmd push" } | ||
| } | ||
|
|
||
| # Fail if any issues when publising the docker images | ||
| if($lastExitCode -ne 0) { | ||
| Write-Error "= PUBLISH: failed!" | ||
| exit 1 | ||
| } | ||
| } | ||
|
|
||
| if($lastExitCode -ne 0) { | ||
| Write-Error "Build failed!" | ||
| } else { | ||
| Write-Host "Build finished successfully" | ||
| } | ||
| exit $lastExitCode |
Oops, something went wrong.