Different configuration of vmx in Vagrantfile and removal of lnk files"

cliqz-oss · May 16, 2018 · 7ded0bf · 7ded0bf
1 parent a684c35
commit 7ded0bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Jenkinsfile.win b/Jenkinsfile.win
@@ -32,8 +32,6 @@ node(WIN_BUILD_NODE) {
 
     def helpers = load "artifacts/build-helpers.groovy"
 
-    sh "find .vagrant/machines/ -type d -name '*.vmx.lck' -print0 | xargs -0 rm -rf"
-     
     helpers.withVagrant("artifacts/${VAGRANTFILE}", "c:\\jenkins", NODE_CPU_COUNT.toInteger(), NODE_MEMORY.toInteger(), NODE_VNC_PORT.toInteger(), WIN_REBUILD_IMAGE.toBoolean()) { nodeId ->
       node(nodeId) {
         stage("Checkout") {

diff --git a/win.Vagrantfile b/win.Vagrantfile
@@ -19,6 +19,8 @@ Vagrant.configure(2) do |config|
     v.memory = ENV["NODE_MEMORY"]
 
     v.vmx["numvcpus"] = "#{ENV['NODE_CPU_COUNT']}"
+    v.vmx["memsize"] =  ENV["NODE_MEMORY"]
+    v.vmx["cpuid.corespersocket"] = "#{ENV['NODE_CPU_COUNT']}"
     v.vmx["RemoteDisplay.vnc.enabled"] = "true"
     v.vmx["RemoteDisplay.vnc.port"] = ENV["NODE_VNC_PORT"]
   end