From c112ff0c0bd92fc1e4c0d0f78604d521a1b07d59 Mon Sep 17 00:00:00 2001 From: Alexander Ding Date: Mon, 24 Oct 2022 18:53:14 +0000 Subject: [PATCH] test: migrate tests to HostProcess pods --- scripts/integration-test.yaml | 27 +++++++++++++++++++++++++++ scripts/utils.sh | 19 ++++++++++++------- 2 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 scripts/integration-test.yaml diff --git a/scripts/integration-test.yaml b/scripts/integration-test.yaml new file mode 100644 index 00000000..7441eb90 --- /dev/null +++ b/scripts/integration-test.yaml @@ -0,0 +1,27 @@ +apiVersion: v1 +kind: Pod +metadata: + name: integration-test + labels: + app: integration-test +spec: + nodeName: windows_node # to be replaced by sed + securityContext: + windowsOptions: + hostProcess: true + runAsUserName: "NT AUTHORITY\\SYSTEM" + hostNetwork: true + containers: + - name: agnhost + image: mcr.microsoft.com/windows/nanoserver:ltsc2019 + command: ['powershell', '-command', 'Start-Sleep 100000'] + volumeMounts: + - mountPath: /integration-test + name: integration-test-volume + nodeSelector: + kubernetes.io/os: windows + volumes: + - name: integration-test-volume + hostPath: + path: / + type: DirectoryOrCreate diff --git a/scripts/utils.sh b/scripts/utils.sh index 472b603f..b3289b9b 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -16,7 +16,7 @@ if ! [ -z "${GCP_ZONE:-}" ]; then fi sync_file_to_vm() { - gcloud compute scp $@ $windows_node:"C:\\Users\\${current_account}" + gcloud compute scp $@ $windows_node:"C:\\" } compile_csi_proxy_integration_tests() { @@ -25,6 +25,10 @@ compile_csi_proxy_integration_tests() { } sync_csi_proxy_integration_tests() { + # delete the pod that is potentially using the old file + # if there is a pod accessing the existing file, this command would hang + kubectl delete -f $pkgdir/scripts/integration-test.yaml --ignore-not-found=true + echo "Sync the integrationtests.exe binary" local integration_bin_path="$pkgdir/bin/integrationtests.test.exe" sync_file_to_vm $integration_bin_path @@ -33,12 +37,13 @@ sync_csi_proxy_integration_tests() { run_csi_proxy_integration_tests() { echo "Run integration tests" local ps1=$(cat << 'EOF' - "& { - $ErrorActionPreference = \"Stop\"; - .\integrationtests.test.exe --test.v - }" + $ErrorActionPreference = "Stop"; + .$Env:CONTAINER_SANDBOX_MOUNT_POINT\integration-test\integrationtests.test.exe --test.v EOF ); - - gcloud compute ssh $windows_node --command="powershell -c $(echo $ps1 | tr '\n' ' ')" + kubectl delete -f $pkgdir/scripts/integration-test.yaml --ignore-not-found=true + sed "s/windows_node/$windows_node/g" < <(cat $pkgdir/scripts/integration-test.yaml) | kubectl create -f - + kubectl wait --for=condition=ready pod -l app=integration-test --timeout=600s + kubectl exec pods/integration-test -- powershell -c $(echo $ps1 | tr '\n' ' ') } +