Merge pull request #46 from simondeziel/network-non-kvm-kernel

tests/network: use 23.10 as the real NIC is passed onto the VM and -k…

bin/helpers

@@ -152,6 +152,11 @@ runsMinimumKernel() (
 
 # cleanup: report if the test passed or not and return the appropriate return code.
 cleanup() {
+    # Run any extra cleanup function
+    if command -v extra_cleanup > /dev/null; then
+      extra_cleanup || true
+    fi
+
     echo ""
     if [ "${FAIL}" = "1" ]; then
         echo "Test failed"

bin/local-run

@@ -9,4 +9,4 @@ test_name="$(basename "${script}")"
 
 echo "==> Running the job ${test_name} against ${lxd_snap_channel}" >&2
 sed -e "1 a LXD_SNAP_CHANNEL=${lxd_snap_channel}" -e "1 r bin/helpers" "${script}" > "${_script}"
-exec bash "${_script}" "${*}"
+exec bash "${_script}" "${@}"

tests/cluster

@@ -1,5 +1,8 @@
 #!/bin/sh
-set -eu
+set -eux
+
+# Install LXD
+install_lxd
 
 PREFIX="cluster-$$"
 
@@ -22,18 +25,17 @@ print_log() {
 
 # Cleanup on shutdown
 SIZE="$1"
-cleanup() {
+extra_cleanup() {
     # Delete the cluster
     echo "==> Deleting the cluster"
     for i in $(seq "${SIZE}"); do
         print_log "${PREFIX}-$i"
         lxc delete --force "${PREFIX}-$i"
     done
 }
-trap cleanup EXIT HUP INT TERM
 
 # Launch the container
-lxc launch ubuntu-daily:22.04 "${PREFIX}-1" -c security.nesting=true
+lxc launch ubuntu-daily:22.04 "${PREFIX}-1" -c security.nesting=true -c security.devlxd.images=true
 
 sleep 10
 

tests/network

@@ -18,7 +18,7 @@ lxc profile device add default root disk path=/ pool=default
 
 # Launch instances with physical NICs
 echo "==> VM on default VLAN with physical"
-lxc init ubuntu-daily:22.04 v1-physical --vm -c limits.cpu=3
+lxc init ubuntu-daily:23.10 v1-physical --vm -c limits.cpu=3
 lxc config device add v1-physical eth0 nic nictype=physical parent="${parentNIC}v1" name=eth0
 lxc start v1-physical
 
@@ -40,7 +40,7 @@ lxc start c1-macvlan
 
 # Launch instances with sriov NICs
 echo "==> VM on default VLAN with sriov"
-lxc init ubuntu-daily:22.04 v1-sriov --vm -c limits.cpu=3
+lxc init ubuntu-daily:23.10 v1-sriov --vm -c limits.cpu=3
 lxc config device add v1-sriov eth0 nic nictype=sriov parent="${parentNIC}" name=eth0
 lxc start v1-sriov