Script to prepare the VM to do SSH

Author: mauriciopoppe

scripts/bump-version.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 # bump-version.sh
 # Bumps an API version from an old version to a new one

scripts/run-integration.sh

@@ -1,4 +1,5 @@
-#/bin/bash
+#!/bin/bash
+
 #
 # Runs the integration tests
 #
@@ -11,10 +12,10 @@
 # - restart the CSI Proxy binary process with a helper powershell script
 # - run the integration tests
 
-set -ex
+set -euxo pipefail
 
-script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-source $script_dir/utils.sh
+pkgdir=${GOPATH}/src/github.com/kubernetes-csi/csi-proxy
+source $pkgdir/scripts/utils.sh
 
 main() {
   compile_csi_proxy

scripts/sync-csi-proxy.sh

@@ -1,4 +1,5 @@
-#/bin/bash
+#!/bin/bash
+
 #
 # Installs CSI Proxy in a kubernetes node
 #
@@ -10,10 +11,10 @@
 # - copy to the VM using scp
 # - restart the CSI Proxy binary process with a helper powershell script
 
-set -ex
+set -euxo pipefail
 
-script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-source $script_dir/utils.sh
+pkgdir=${GOPATH}/src/github.com/kubernetes-csi/csi-proxy
+source $pkgdir/scripts/utils.sh
 
 main() {
   compile_csi_proxy

scripts/utils.psm1

@@ -1,5 +1,6 @@
 function Restart-CSIProxy {
   # stop the csiproxy service
+  Get-Process csi-proxy | Stop-Process -Force
   sc.exe stop csiproxy
   Start-Sleep -Seconds 1;
   sc.exe delete csiproxy
@@ -10,7 +11,7 @@ function Restart-CSIProxy {
 
   # restart the csiproxy service
   $flags = "-v=5 -windows-service -log_file=C:\etc\kubernetes\logs\csi-proxy.log -logtostderr=false"
-  sc.exe create csiproxy binPath= "C:\etc\kubernetes\node\bin\csi-proxy.exe $flags"
+  sc.exe create csiproxy start= "auto" binPath= "C:\etc\kubernetes\node\bin\csi-proxy.exe $flags"
   sc.exe failure csiproxy reset= 0 actions= restart/10000
   sc.exe start csiproxy
 

scripts/utils.sh

@@ -1,15 +1,18 @@
-#/bin/bash
+#!/bin/bash
+
 # Importing this library shouldn't have side effects
 
-script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+pkgdir=${GOPATH}/src/github.com/kubernetes-csi/csi-proxy
 
-# current_account is the current Google SDK Account
-current_account=$(gcloud config list account --format "value(core.account)" | sed -r 's/@\S+//g')
+# current_account is the current user
+# in CI, the value is `prow`
+current_account=$USER
 # windows_node is the id of the GCE Windows instance
 windows_node=$(kubectl get nodes -l kubernetes.io/os=windows -o jsonpath='{.items[*].metadata.name}')
 
-if ! [ -z $GCP_ZONE ]; then
-  export CLOUDSDK_COMPUTE_ZONE=$GCP_ZONE
+# set the default zone for the gcloud sdk
+if ! [ -z "${GCP_ZONE:-}" ]; then
+  export CLOUDSDK_COMPUTE_ZONE="$GCP_ZONE"
 fi
 
 sync_file_to_vm() {
@@ -18,41 +21,42 @@ sync_file_to_vm() {
 
 compile_csi_proxy() {
   echo "Compiling CSI Proxy"
-  make build
+  make -C $pkgdir build
 }
 
 compile_csi_proxy_integration_tests() {
   echo "Compiling CSI Proxy integration tests"
-  GOOS=windows GOARCH=amd64 go test -c ./integrationtests -o bin/integrationtests.test.exe
+  GOOS=windows GOARCH=amd64 go test -c $pkgdir/integrationtests -o $pkgdir/bin/integrationtests.test.exe
 }
 
 sync_csi_proxy() {
   echo "Sync the csi-proxy.exe binary"
-  local csi_proxy_bin_path="$script_dir/../bin/csi-proxy.exe"
+  local csi_proxy_bin_path="$pkgdir/bin/csi-proxy.exe"
   sync_file_to_vm $csi_proxy_bin_path
 }
 
 sync_csi_proxy_integration_tests() {
   echo "Sync the integrationtests.exe binary"
-  local integration_bin_path="$script_dir/../bin/integrationtests.test.exe"
+  local integration_bin_path="$pkgdir/bin/integrationtests.test.exe"
   sync_file_to_vm $integration_bin_path
 }
 
 sync_powershell_utils() {
-  local utils_psm1="$script_dir/utils.psm1"
+  local utils_psm1="$pkgdir/scripts/utils.psm1"
   sync_file_to_vm $utils_psm1
 }
 
 restart_csi_proxy() {
   echo "Restart csi-proxy service"
-  gcloud compute ssh $windows_node --command='powershell -c "& { Import-Module .\utils.psm1; Restart-CSIProxy }"'
+  gcloud compute ssh $windows_node --command='powershell -c "& { $ErrorActionPreference = \"Stop\"; Import-Module (Resolve-Path(\"utils.psm1\")); Restart-CSIProxy; }"'
 }
 
 run_csi_proxy_integration_tests() {
   echo "Run integration tests"
   local ps1=$(cat << 'EOF'
   "& {
-    Import-Module .\\utils.psm1;
+    $ErrorActionPreference = \"Stop\";
+    Import-Module (Resolve-Path(\"utils.psm1\"));
     Run-CSIProxyIntegrationTests -test_args \"--test.v --test.run TestAPIGroups\";
     Run-CSIProxyIntegrationTests -test_args \"--test.v --test.run TestFilesystemAPIGroup\";
     Run-CSIProxyIntegrationTests -test_args \"--test.v --test.run TestDiskAPIGroup\";