Commit 48a98b3a authored by Jean-Francois Rey's avatar Jean-Francois Rey
Browse files

update to 1 cpu to work with nested virtualization

parent 467756c4
...@@ -14,7 +14,6 @@ Gen-VM: ...@@ -14,7 +14,6 @@ Gen-VM:
- vboxmanage unregistervm --delete MacOSCR4 || true - vboxmanage unregistervm --delete MacOSCR4 || true
- vagrant destroy -f - vagrant destroy -f
- vagrant box update - vagrant box update
#- vagrant up > vagrantup.log
- vagrant up - vagrant up
- vagrant snapshot save bootR4 - vagrant snapshot save bootR4
after_script: after_script:
...@@ -43,8 +42,9 @@ Deploy-VM: ...@@ -43,8 +42,9 @@ Deploy-VM:
stage: deploy stage: deploy
when: manual when: manual
script: script:
- sudo chmod -R ug+rwx /home/gitlab-runner/VirtualBox VMs/MACOSCR4" || true
- sudo vboxmanage unregistervm MACOSCR4 || true
- vboxmanage controlvm MACOSCR4 poweroff || true - vboxmanage controlvm MACOSCR4 poweroff || true
- vboxmanage unregistervm --delete MACOSCR4 || true - vboxmanage unregistervm --delete MACOSCR4 || true
- vboxmanage modifyvm MacOSCR4 --name MACOSCR4 - vboxmanage modifyvm MacOSCR4 --name MACOSCR4
- sudo vboxmanage unregistervm MACOSCR4 || true
- sudo vboxmanage registervm "/home/gitlab-runner/VirtualBox VMs/MACOSCR4/MACOSCR4.vbox" - sudo vboxmanage registervm "/home/gitlab-runner/VirtualBox VMs/MACOSCR4/MACOSCR4.vbox"
...@@ -14,7 +14,7 @@ Vagrant.configure("2") do |config| ...@@ -14,7 +14,7 @@ Vagrant.configure("2") do |config|
config.ssh.insert_key = false config.ssh.insert_key = false
config.ssh.export_command_template = 'export PATH=/usr/local/bin:$PATH' config.ssh.export_command_template = 'export PATH=/usr/local/bin:$PATH'
config.ssh.connect_timeout = 30 config.ssh.connect_timeout = 30
config.ssh.keep_alive = true config.ssh.keep_alive = true
config.vm.provider "virtualbox" do |vb| config.vm.provider "virtualbox" do |vb|
# Display the VirtualBox GUI when booting the machine # Display the VirtualBox GUI when booting the machine
...@@ -22,13 +22,15 @@ Vagrant.configure("2") do |config| ...@@ -22,13 +22,15 @@ Vagrant.configure("2") do |config|
vb.name = "MacOSCR4" vb.name = "MacOSCR4"
#vb.customize ["modifyvm", :id, "--memory", 8192] #vb.customize ["modifyvm", :id, "--memory", 8192]
vb.customize ["modifyvm", :id, "--memory", 4092] vb.customize ["modifyvm", :id, "--memory", 4092]
vb.customize ["modifyvm", :id, "--cpus", 2] vb.customize ["modifyvm", :id, "--cpus", 1]
vb.customize ["modifyvm", :id, "--vram", 128] vb.customize ["modifyvm", :id, "--vram", 128]
vb.customize ["modifyvm", :id, "--graphicscontroller","vboxvga"] vb.customize ["modifyvm", :id, "--graphicscontroller","vboxvga"]
vb.customize ["modifyvm", :id, "--nested-hw-virt", "on"] #vb.customize ["modifyvm", :id, "--nested-hw-virt", "on"]
vb.customize ["modifyvm", :id, "--nictype1", "virtio"] vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
vb.customize ["modifyvm", :id, "--vtxvpid", "on"] #vb.customize ["modifyvm", :id, "--vtxvpid", "on"]
vb.customize ["modifyvm", :id, "--largepages", "on"] #vb.customize ["modifyvm", :id, "--paravirtprovider", "minimal"]
#vb.customize ["modifyvm", :id, "--largepages", "on"]
#vb.customize ["modifyvm", :id, "--hwvirtex", "on"]
vb.customize ["setextradata", "global", "GUI/SuppressMessages", "all" ] vb.customize ["setextradata", "global", "GUI/SuppressMessages", "all" ]
end end
......
...@@ -14,34 +14,17 @@ ...@@ -14,34 +14,17 @@
# reboot: # reboot:
# reboot_timeout: 3600 # reboot_timeout: 3600
## Use copy to avoid ssh timeout or error ## Use copy to avoid ssh timeout or error
- name: waiting ssh up - name: disable sleep
wait_for_connection: shell:
delay: 15 cmd: sudo pmset -a disablesleep 1
timeout: 300
- name: Install R and dependencies - name: Install R and dependencies
script: files/install-r.sh script: files/install-r.sh
- name: waiting ssh up
wait_for_connection:
delay: 15
timeout: 300
- name: Install R packages and dependencies - name: Install R packages and dependencies
script: files/install-r-library.sh script: files/install-r-library.sh
- name: waiting ssh up
wait_for_connection:
delay: 15
timeout: 300
- name: Install MacTex - name: Install MacTex
script: files/install-mactex.sh script: files/install-mactex.sh
- name: waiting ssh up
wait_for_connection:
delay: 15
timeout: 300
- name: Install Xquartz - name: Install Xquartz
script: files/install-xquartz.sh script: files/install-xquartz.sh
- name: waiting ssh up
wait_for_connection:
delay: 15
timeout: 300
- name: Install GitLab-Runner - name: Install GitLab-Runner
script: files/install-gitlabrunner.sh script: files/install-gitlabrunner.sh
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment