github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1296 from Random-Liu/fix-ssh-disconnect

Browse Source 
Set keepalive for ssh in windows test.
This commit is contained in:
Mike Brown 2019-09-25 10:02:59 -05:00 committed by GitHub
commit a1e4f99a32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/windows/runner.sh
View File

@ -85,33 +85,35 @@ gcloud compute instances create "${node_name}" --machine-type=n1-standard-2 \
--metadata-from-file=windows-startup-script-ps1="${script_path}/setup-ssh.ps1" --metadata-from-file=windows-startup-script-ps1="${script_path}/setup-ssh.ps1"
trap cleanup EXIT trap cleanup EXIT
ssh=(gcloud compute ssh --ssh-flag="-ServerAliveInterval=30")
scp=(gcloud compute scp)
log "Wait for ssh to be ready" log "Wait for ssh to be ready"
retry_anyway gcloud compute ssh "${node_name}" --command="echo ssh ready" retry_anyway "${ssh[@]}" "${node_name}" --command="echo ssh ready"
log "Setup test environment in the test instance" log "Setup test environment in the test instance"
retry_on_permission_error gcloud compute scp "${script_path}/setup-vm.ps1" "${node_name}":"C:/setup-vm.ps1" retry_on_permission_error "${scp[@]}" "${script_path}/setup-vm.ps1" "${node_name}":"C:/setup-vm.ps1"
retry_on_permission_error gcloud compute ssh "${node_name}" --command="powershell /c C:/setup-vm.ps1" retry_on_permission_error "${ssh[@]}" "${node_name}" --command="powershell /c C:/setup-vm.ps1"
log "Reboot the test instance to refresh environment variables" log "Reboot the test instance to refresh environment variables"
retry_on_permission_error gcloud compute ssh "${node_name}" --command="powershell /c Restart-Computer" retry_on_permission_error "${ssh[@]}" "${node_name}" --command="powershell /c Restart-Computer"
log "Wait for ssh to be ready" log "Wait for ssh to be ready"
retry_anyway gcloud compute ssh "${node_name}" --command="echo ssh ready" retry_anyway "${ssh[@]}" "${node_name}" --command="echo ssh ready"
log "Run test on the test instance" log "Run test on the test instance"
cri_tar="/tmp/cri.tar.gz" cri_tar="/tmp/cri.tar.gz"
tar -zcf "${cri_tar}" -C "${root}" . --owner=0 --group=0 tar -zcf "${cri_tar}" -C "${root}" . --owner=0 --group=0
retry_on_permission_error gcloud compute scp "${script_path}/test.sh" "${node_name}":"C:/test.sh" retry_on_permission_error "${scp[@]}" "${script_path}/test.sh" "${node_name}":"C:/test.sh"
retry_on_permission_error gcloud compute scp "${cri_tar}" "${node_name}":"C:/cri.tar.gz" retry_on_permission_error "${scp[@]}" "${cri_tar}" "${node_name}":"C:/cri.tar.gz"
rm "${cri_tar}" rm "${cri_tar}"
# git-bash doesn't return test exit code, the command should # git-bash doesn't return test exit code, the command should
# succeed. We'll collect test exit code from _artifacts/. # succeed. We'll collect test exit code from _artifacts/.
retry_on_permission_error gcloud compute ssh "${node_name}" --command='powershell /c "Start-Process -FilePath \"C:\Program Files\Git\git-bash.exe\" -ArgumentList \"-elc\",\"`\"/c/test.sh &> /c/test.log`\"\" -Wait"' retry_on_permission_error "${ssh[@]}" "${node_name}" --command='powershell /c "Start-Process -FilePath \"C:\Program Files\Git\git-bash.exe\" -ArgumentList \"-elc\",\"`\"/c/test.sh &> /c/test.log`\"\" -Wait"'
log "Collect test logs" log "Collect test logs"
mkdir -p "${ARTIFACTS}" mkdir -p "${ARTIFACTS}"
retry_on_permission_error gcloud compute scp "${node_name}":"C:/test.log" "${ARTIFACTS}" retry_on_permission_error "${scp[@]}" "${node_name}":"C:/test.log" "${ARTIFACTS}"
retry_on_permission_error gcloud compute scp --recurse "${node_name}":"C:/_artifacts/*" "${ARTIFACTS}" retry_on_permission_error "${scp[@]}" --recurse "${node_name}":"C:/_artifacts/*" "${ARTIFACTS}"
log "Test output:" log "Test output:"
cat "${ARTIFACTS}/test.log" cat "${ARTIFACTS}/test.log"