Skip to content

Commit 12bc238

Browse files
committed
CI: logging and organization in powershell tasks
1 parent 5269526 commit 12bc238

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

ci/common-scripts/setup-windows-container.psm1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ function Set-TmpDir
33
$working_directory = Get-Location
44
$guid = $( New-Guid ).Guid
55
$temp_directory=Join-Path -Path $working_directory.path -ChildPath "temp-$guid"
6+
Write-Host *** Creating and setting temp environment variables to $temp_directory ***
67
New-Item -Path $temp_directory -ItemType Directory
78
$env:TMP=$temp_directory
9+
$env:TEMP=$temp_directory
810
$env:SystemTemp=$temp_directory
911
}
1012

ci/tasks/test-integration-stembuild-windows/run.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ $env:PATH += ";c:\var\vcap\packages\git\usr\bin"
1212
$ROOT_DIR=Get-Location
1313
Write-Host "ROOT: $ROOT_DIR"
1414

15-
$env:VM_NAME= cat $ROOT_DIR/integration-vm-name/name
16-
1715
$TMP_DIR=Join-Path $ROOT_DIR tmp
1816

1917
Write-Host *** creating and setting temp environment variable to $TMP_DIR***
@@ -23,10 +21,11 @@ $env:TMP=$TMP_DIR
2321
$env:TEMP=$TMP_DIR
2422
$env:SystemTemp=$TMP_DIR
2523

24+
$env:VM_NAME= cat $ROOT_DIR/integration-vm-name/name
2625
$env:TARGET_VM_IP = cat $ROOT_DIR/nimbus-ips/name
2726
$env:STEMBUILD_VERSION = cat $ROOT_DIR/version/version
2827

29-
$vcenterCertPath="$TMP_DIR/vcenter.crt"
28+
$vcenterCertPath="$TMP_DIR\vcenter_ca.crt"
3029
Write-Output $env:VCENTER_CA_CERT > $vcenterCertPath
3130
$env:GOVC_TLS_CA_CERTS=$vcenterCertPath
3231

0 commit comments

Comments
 (0)