diff --git a/README.md b/README.md index e68c2d8df72b0447c647df903283331402679848..8aa004fc1a9031b66fe20c0944694f41e99e754f 100644 --- a/README.md +++ b/README.md @@ -110,3 +110,25 @@ The following modules are integration tests pytest -s --pyargs clmctest.inputs pytest -s --pyargs clmctest.monitoring ``` + +#### CI Testing + +A vagrant VM is setup on givry in the directory `/home/mjb/flame-clmc` + +The VM is started using a libvirt vagrant file through the following command: + +`VAGRANT_VAGRANTFILE=Vagrantfile.libvirt vagrant up` + +The VM has gitlab-runner installed:: + +``` +VAGRANT_VAGRANTFILE=Vagrantfile.libvirt vagrant up +VAGRANT_VAGRANTFILE=Vagrantfile.libvirt vagrant ssh -- -tt "sudo /vagrant/scripts/test/install-git-runner.sh" +``` + +Runners can be installed on developers virtualbox VMs if necessary, in that case you can just use + +``` +vagrant up +vagrant ssh -- -tt "sudo /vagrant/scripts/test/install-git-runner.sh" +``` \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile index 5a3bae454387d5b737b5f464b48aa4f09d340230..3840503cc55a8f85552ffda648c524e4991a3605 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -12,13 +12,14 @@ service lxc-net restart SCRIPT Vagrant.configure("2") do |config| - config.vm.box = "yk0/ubuntu-xenial" - - config.vm.provider :libvirt do |domain| - domain.memory = 8192 - domain.cpus = 4 + config.vm.box = "ubuntu/xenial64" + config.vm.provider "virtualbox" do |vb| + vb.cpus = 4 + vb.memory = "8192" end + #config.vm.network "forwarded_port", guest: 80, host: 8080 + # Install lxc config.vm.provision :shell, inline: $lxc_script end