From 3ab2af0850c8078401a0f3e827a8098def11521a Mon Sep 17 00:00:00 2001 From: MJB <mjb@it-innovation.soton.ac.uk> Date: Mon, 13 Aug 2018 23:54:04 +0100 Subject: [PATCH] #88 updates to readme for protected branches --- README.md | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index b39e2db..4af8cc0 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ lxc init Follow the interactive prompts, use the defaults apart from the storage pool type, use `dir` type -Configure ip table persistence +Now configure ip table persistence, this is needed for the fixtures script to work but not for CI ``` echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo debconf-set-selections @@ -147,22 +147,4 @@ cp /tmp/install-git-runner.sh /var/lib/lxd/containers/clmc-ci/rootfs/tmp chmod 755 /var/lib/lxd/containers/clmc-ci/rootfs/tmp ``` - - -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 +Note that the branch must be "protected" for the secret repo rc variables to be passed to the CI script \ No newline at end of file -- GitLab