diff --git a/README.md b/README.md index 0fba7df64b563baa34c38e8db3b3365caafd0274..d30c8069339b973e966f484c76c74814d484a91e 100644 --- a/README.md +++ b/README.md @@ -95,20 +95,22 @@ As part of the clmc-service installation, the service's unit tests have been run Attach to the test-runner to run the tests ```shell -lxc-attach -n test-runner +lxc exec test-runner /bin/bash ``` Build and install the CLMC test Python module: ```shell -cd /vagrant/src/test +cd /opt/clmc/src/test python setup.py sdist --dist-dir=../../build -pip3 install /vagrant/build/clmctest-<version>.tar.gz +apt install python-pip +pip install /opt/clmc/build/clmctest-<version>.tar.gz ``` The following module is unit tests: ```shell +apt install python3-pytest pytest -s --pyargs clmctest.scripts ``` diff --git a/Vagrantfile b/Vagrantfile index 02fc7bb504c593f0da8c3dc4e28c27f4da86525d..c0eba4198ef137de24298f5f305c2055153e2737 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -21,6 +21,8 @@ $lxc_script = <<-SCRIPT +export DEBIAN_FRONTEND=noninteractive + apt-get update apt-get install python3 python3-setuptools jq -y @@ -29,7 +31,8 @@ echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo deb echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections apt-get -y install iptables-persistent -lxd init --auto --storage-backend dir + +lxd init --auto --storage-backend dir lxc network create lxcbr0 ipv6.address=none ipv4.address=172.40.231.1/24 ipv4.nat=true # enable NTP @@ -45,6 +48,7 @@ timedatectl set-ntp no #done apt-get install ntp -y + echo "timesync set to ntpd" # set timezone to London @@ -54,9 +58,10 @@ SCRIPT Vagrant.configure("2") do |config| config.vm.box = "ubuntu/bionic64" + config.vm.box_version = '20190627.1.0' config.disksize.size = '50GB' config.vm.provider "virtualbox" do |vb| - vb.cpus = 4 + vb.cpus = 2 vb.memory = "8192" end