From faaa8e7aa59731293929d7214ff123ab9c55d6c4 Mon Sep 17 00:00:00 2001 From: Alfredo Matas Date: Thu, 23 Apr 2020 20:23:02 +0200 Subject: [PATCH 1/3] GPII-4195: Add 1909 and LTSC Windows 10 version to Vagrantfile --- Vagrantfile | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 162c989e5..a49fc0910 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,24 +10,20 @@ ram = ENV["VM_RAM"] || 2048 Vagrant.configure(2) do |config| - config.vm.box = "inclusivedesign/windows10-eval-x64-Apps" - config.vm.guest = :windows - - config.vm.communicator = "winrm" - config.winrm.username = "vagrant" - config.winrm.password = "vagrant" - config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true - config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "rdp", auto_correct:true - - config.vm.provider :virtualbox do |vm| - vm.gui = true - vm.customize ["modifyvm", :id, "--memory", ram] - vm.customize ["modifyvm", :id, "--cpus", cpus] - vm.customize ["modifyvm", :id, "--vram", "256"] - vm.customize ["modifyvm", :id, "--accelerate3d", "off"] - vm.customize ["modifyvm", :id, "--audio", "null", "--audiocontroller", "hda"] - vm.customize ["modifyvm", :id, "--ioapic", "on"] - vm.customize ["setextradata", "global", "GUI/SuppressMessages", "all"] + ["LTSC", "1909"].each do |flavour| + config.vm.define "#{flavour}" do |latest| + latest.vm.box = "gpii-ops/windows10-#{flavour}-eval-x64-universal" + latest.vm.provider :virtualbox do |vm| + vm.gui = true + vm.customize ["modifyvm", :id, "--memory", ram] + vm.customize ["modifyvm", :id, "--cpus", cpus] + vm.customize ["modifyvm", :id, "--vram", "256"] + vm.customize ["modifyvm", :id, "--accelerate3d", "off"] + vm.customize ["modifyvm", :id, "--audio", "null", "--audiocontroller", "hda"] + vm.customize ["modifyvm", :id, "--ioapic", "on"] + vm.customize ["setextradata", "global", "GUI/SuppressMessages", "all"] + end + end end config.vm.provision "shell", path: "provisioning/Build.ps1", args: "-originalBuildScriptPath \"C:\\vagrant\\provisioning\\\"" From 0e7069fd60c77a5836d850738ac5438204bd8e62 Mon Sep 17 00:00:00 2001 From: Alfredo Matas Date: Wed, 6 May 2020 13:01:18 +0200 Subject: [PATCH 2/3] GPII-4195: Remove install full progress --- provisioning/Installer.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provisioning/Installer.ps1 b/provisioning/Installer.ps1 index 83284d5b1..7149fafa6 100644 --- a/provisioning/Installer.ps1 +++ b/provisioning/Installer.ps1 @@ -25,7 +25,7 @@ $node = Get-Command "node.exe" | Select -expandproperty Path $chocolatey = "$env:ChocolateyInstall\bin\choco.exe" -f $env:SystemDrive # Installing required choco packages. -Invoke-Command $chocolatey "install wixtoolset -y" +Invoke-Command $chocolatey "install wixtoolset --no-progress -y" refreshenv # The path to WIX can be found in $env:WIX env variable but looks like chocolatey's refreshenv # is not able to set such variable in this session. As a workaround, we ask the registry @@ -34,7 +34,7 @@ $wixSetupPath = Join-Path (Get-ItemProperty 'HKLM:\SYSTEM\CurrentControlSet\Cont Add-Path $wixSetupPath $true refreshenv -Invoke-Command $chocolatey "install msbuild.extensionpack -y" +Invoke-Command $chocolatey "install msbuild.extensionpack --no-progress -y" refreshenv # If $installerDir exists delete it and clone current branch of installer. From 053927ca6f5ac6557fe8c81b8e894d5ebc4935f5 Mon Sep 17 00:00:00 2001 From: Alfredo Matas Date: Wed, 6 May 2020 13:12:37 +0200 Subject: [PATCH 3/3] GPII-4195: Speed up the VM creation --- Vagrantfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Vagrantfile b/Vagrantfile index a49fc0910..4205df7b6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -15,6 +15,7 @@ Vagrant.configure(2) do |config| latest.vm.box = "gpii-ops/windows10-#{flavour}-eval-x64-universal" latest.vm.provider :virtualbox do |vm| vm.gui = true + vm.linked_clone = true vm.customize ["modifyvm", :id, "--memory", ram] vm.customize ["modifyvm", :id, "--cpus", cpus] vm.customize ["modifyvm", :id, "--vram", "256"]