[Windows] Reorganize temporary file storage and separate cleanup activities (#11054)
This commit is contained in:
@@ -72,6 +72,11 @@ variable "imagedata_file" {
|
||||
default = "C:\\imagedata.json"
|
||||
}
|
||||
|
||||
variable "temp_dir" {
|
||||
type = string
|
||||
default = "D:\\temp"
|
||||
}
|
||||
|
||||
variable "install_password" {
|
||||
type = string
|
||||
default = ""
|
||||
@@ -190,7 +195,10 @@ build {
|
||||
sources = ["source.azure-arm.image"]
|
||||
|
||||
provisioner "powershell" {
|
||||
inline = ["New-Item -Path ${var.image_folder} -ItemType Directory -Force"]
|
||||
inline = [
|
||||
"New-Item -Path ${var.image_folder} -ItemType Directory -Force",
|
||||
"New-Item -Path ${var.temp_dir} -ItemType Directory -Force"
|
||||
]
|
||||
}
|
||||
|
||||
provisioner "file" {
|
||||
@@ -253,7 +261,7 @@ build {
|
||||
}
|
||||
|
||||
provisioner "powershell" {
|
||||
environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}"]
|
||||
environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
|
||||
execution_policy = "unrestricted"
|
||||
scripts = [
|
||||
"${path.root}/../scripts/build/Configure-WindowsDefender.ps1",
|
||||
@@ -277,7 +285,7 @@ build {
|
||||
}
|
||||
|
||||
provisioner "powershell" {
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"]
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
|
||||
scripts = [
|
||||
"${path.root}/../scripts/build/Install-VCRedist.ps1",
|
||||
"${path.root}/../scripts/build/Install-Docker.ps1",
|
||||
@@ -297,7 +305,7 @@ build {
|
||||
provisioner "powershell" {
|
||||
elevated_password = "${var.install_password}"
|
||||
elevated_user = "${var.install_user}"
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"]
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
|
||||
scripts = [
|
||||
"${path.root}/../scripts/build/Install-VisualStudio.ps1",
|
||||
"${path.root}/../scripts/build/Install-KubernetesTools.ps1",
|
||||
@@ -307,7 +315,7 @@ build {
|
||||
}
|
||||
|
||||
provisioner "powershell" {
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"]
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
|
||||
scripts = [
|
||||
"${path.root}/../scripts/build/Install-Wix.ps1",
|
||||
"${path.root}/../scripts/build/Install-WDK.ps1",
|
||||
@@ -323,7 +331,7 @@ build {
|
||||
|
||||
provisioner "powershell" {
|
||||
execution_policy = "remotesigned"
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"]
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
|
||||
scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"]
|
||||
}
|
||||
|
||||
@@ -336,7 +344,7 @@ build {
|
||||
}
|
||||
|
||||
provisioner "powershell" {
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"]
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
|
||||
scripts = [
|
||||
"${path.root}/../scripts/build/Install-ActionsCache.ps1",
|
||||
"${path.root}/../scripts/build/Install-Ruby.ps1",
|
||||
@@ -409,9 +417,10 @@ build {
|
||||
|
||||
provisioner "powershell" {
|
||||
pause_before = "2m0s"
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"]
|
||||
environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
|
||||
scripts = [
|
||||
"${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1",
|
||||
"${path.root}/../scripts/build/Invoke-Cleanup.ps1",
|
||||
"${path.root}/../scripts/tests/RunAll-Tests.ps1"
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user