Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[GPII-4195] Add 1909 and LTSC Windows 10 version to Vagrantfile #314

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[GPII-4195] Add 1909 and LTSC Windows 10 version to Vagrantfile #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33c82eb
GPII-4195: Add 1909 and LTSC Windows 10 version to Vagrantfile
amatas Apr 23, 2020
f95ef6f
GPII-4195: Updated languageTests to support testing on LTSC and postLTSC
javihernandez Apr 27, 2020
40b56fa
Merge pull request #1 from javihernandez/GPII-4195
amatas Apr 27, 2020
e4e4055
GPII-4195: Speed up the VM creation
amatas May 6, 2020
0f647d2
Merge branch 'GPII-4195' of github.com:amatas/gpii-windows into GPII-…
amatas May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 15 additions & 22 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,23 @@ 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.linked_clone = 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", inline: <<-SHELL
choco upgrade firefox googlechrome -y
SHELL

# Provide original script path for use in relative paths, since vagrant copies the script to a temporary location
config.vm.provision "shell", path: "provisioning/Chocolatey.ps1", args: "-originalBuildScriptPath \"C:\\vagrant\\provisioning\\\""
config.vm.provision "shell", path: "provisioning/CouchDB.ps1", args: "-originalBuildScriptPath \"C:\\vagrant\\provisioning\\\""
Expand Down
14 changes: 11 additions & 3 deletions gpii/node_modules/gpii-localisation/test/testLanguage.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions provisioning/Chocolatey.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $chocolatey = "$env:ChocolateyInstall\bin\choco.exe" -f $env:SystemDrive

$nodePath = "C:\Program Files (x86)\nodejs"
$nodeVersion = "10.11.0"
Invoke-Command $chocolatey "install nodejs.install --version $($nodeVersion) --forcex86 -y"
Invoke-Command $chocolatey "install nodejs.install --version $($nodeVersion) --forcex86 -y --no-progress"
# TODO: Correct path and automatically added is this one
# C:\Users\vagrant\AppData\Roaming\npm review it.
#Add-Path $nodePath $true
Expand All @@ -26,7 +26,7 @@ Invoke-Environment (Join-Path $nodePath "nodevars.bat")
refreshenv

$python2Path = "C:\tools\python2"
Invoke-Command $chocolatey "install python2 -y"
Invoke-Command $chocolatey "install python2 -y --no-progress"
Add-Path $python2Path $true
refreshenv

Expand Down