Skip to content
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

chore: restore and fix SSH tests on Windows Server Core images #391

Merged
merged 9 commits into from
Apr 28, 2024
Merged

chore: restore and fix SSH tests on Windows Server Core images #391

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
58b18c8
chore: don't skip SSH tests on Windows Server Core images
lemeurherve Apr 27, 2024
ad33cf9
debug: windowsservercore-ltsc2019 only for now
lemeurherve Apr 27, 2024
71b67f0
debug: tests quiet=false
lemeurherve Apr 27, 2024
77c4754
wait a bit before trying to connect with SSH
lemeurherve Apr 28, 2024
17333a9
debug: also build a nanoserver for now
lemeurherve Apr 28, 2024
cf8eb99
new tests from #295
lemeurherve Apr 28, 2024
dd76b7e
build all images again
lemeurherve Apr 28, 2024
0f95347
Revert "debug: tests quiet=false"
lemeurherve Apr 28, 2024
023c505
Revert "new tests from #295"
lemeurherve Apr 28, 2024
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: 6 additions & 3 deletions tests/sshAgent.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,11 @@ Describe "[$global:IMAGE_NAME] image has correct version of java and git-lfs ins
}
}

Describe "[$global:IMAGE_NAME] create agent container with pubkey as argument" -Skip:($global:WINDOWSFLAVOR -eq 'windowsservercore') {
Describe "[$global:IMAGE_NAME] create agent container with pubkey as argument" {
BeforeAll {
docker run --detach --tty --name="$global:CONTAINERNAME" --publish-all "$global:IMAGE_NAME" "$global:PUBLIC_SSH_KEY"
Is-ContainerRunning $global:CONTAINERNAME | Should -BeTrue
Start-Sleep -Seconds 10
}

It 'runs commands via ssh' {
Expand All @@ -143,10 +144,11 @@ Describe "[$global:IMAGE_NAME] create agent container with pubkey as argument" -
}
}

Describe "[$global:IMAGE_NAME] create agent container with pubkey as envvar" -Skip:($global:WINDOWSFLAVOR -eq 'windowsservercore') {
Describe "[$global:IMAGE_NAME] create agent container with pubkey as envvar" {
BeforeAll {
docker run --detach --tty --name="$global:CONTAINERNAME" --publish-all --env="JENKINS_AGENT_SSH_PUBKEY=$global:PUBLIC_SSH_KEY" "$global:IMAGE_NAME"
Is-ContainerRunning $global:CONTAINERNAME | Should -BeTrue
Start-Sleep -Seconds 10
}

It 'runs commands via ssh' {
Expand All @@ -162,11 +164,12 @@ Describe "[$global:IMAGE_NAME] create agent container with pubkey as envvar" -Sk


$global:DOCKER_PLUGIN_DEFAULT_ARG="/usr/sbin/sshd -D -p 22"
Describe "[$global:IMAGE_NAME] create agent container like docker-plugin with '$global:DOCKER_PLUGIN_DEFAULT_ARG' as argument" -Skip:($global:WINDOWSFLAVOR -eq 'windowsservercore') {
Describe "[$global:IMAGE_NAME] create agent container like docker-plugin with '$global:DOCKER_PLUGIN_DEFAULT_ARG' as argument" {
BeforeAll {
[string]::IsNullOrWhiteSpace($global:DOCKER_PLUGIN_DEFAULT_ARG) | Should -BeFalse
docker run --detach --tty --name="$global:CONTAINERNAME" --publish-all --env="JENKINS_AGENT_SSH_PUBKEY=$global:PUBLIC_SSH_KEY" "$global:IMAGE_NAME" "$global:DOCKER_PLUGIN_DEFAULT_ARG"
Is-ContainerRunning $global:CONTAINERNAME | Should -BeTrue
Start-Sleep -Seconds 10
}

It 'runs commands via ssh' {
Expand Down