diff --git a/README.md b/README.md index 1e266031fc235fbd86b8923dbdd64fadbfa3de32..cba9946bceff6ac03a4ad3344d53c8eec49f42fc 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,12 @@ Implementation documentation and discussion can be found in the docs directory. Testing is implemented using pytest using the following convention: -* The testing environment is Vagrant/Virtualbox for a base VM with LXC is installed for specific containers. +* The testing environment is Vagrant/Virtualbox for a base VM with LXD is installed for specific containers. * Tests are written in python using pytest * Related tests are stored in a python module `src/test/clmctest/<testmodule>` to create a suite of tests. All tests are stored in files test_*.py, there can be many tests per file, and many files per module * Tests are executed against a set of LXC containers described in `src/test/clmctest/rspec.json`. * Tests are executed from the test-runner container on the VM using install python modules +* CI testing is on givry using nested LXD containers Create a single VM with LXC installed and configured with lxcbr0 configured for the network 172.40.231.0/24 @@ -121,7 +122,7 @@ pytest -s --pyargs clmctest.monitoring #### CI Testing -A lxd container is setup on givry called `clmc-ci`. The container is priviledged and allows for nested containers. The container was created using the following commands +A lxd container is setup on givry called `flame-clmc-ci`. The container is priviledged and allows for nested containers. The container was created using the following commands ``` lxc launch ubuntu:18.04 flame-clmc-ci -c security.privileged=true -c security.nesting=true @@ -130,7 +131,7 @@ lxc launch ubuntu:18.04 flame-clmc-ci -c security.privileged=true -c security.ne the container is then started and LXD initialised ``` -lxc exec clmc-ci -- bash +lxc exec flame-clmc-ci -- bash lxd init ```