tests,slices: correct a couple of slices, add tests

slices/netplan-generator.yaml

@@ -4,16 +4,23 @@ essential:
   - netplan-generator_copyright
 
 slices:
-  data:
+  bins:
     essential:
       - libc6_libs
       - libglib2.0-0t64_libs
       - libnetplan1_libs
       - systemd_bins
     contents:
-      /usr/lib/netplan/PLACEHOLDER:
-      /usr/lib/systemd/system-generators/netplan:
       /usr/libexec/netplan/generate:
+      /usr/lib/systemd/system-generators/netplan:
+
+  # the generator needs the folder and thus carry
+  # a placeholder file, it will be removed and a
+  # symlink to /usr/libexec/netplan/generate will
+  # be created in this folder
+  placeholder:
+    contents:
+      /usr/lib/netplan/PLACEHOLDER:
 
   copyright:
     contents:

slices/netplan.io.yaml

@@ -11,8 +11,8 @@ slices:
       - libglib2.0-0t64_libs
       - libnetplan1_libs
       - libsystemd0_libs
-      - netplan-generator_data
-      - netplan.io_cli
+      - netplan-generator_bins
+      - netplan.io_scripts
       - python3-dbus_data
       - python3-netifaces_data
       - python3-netplan_data
@@ -22,12 +22,12 @@ slices:
     contents:
       /usr/sbin/netplan:
 
-  cli:
+  scripts:
     contents:
       /usr/share/netplan/netplan.script:
       /usr/share/netplan/netplan_cli/**:
 
-  extras:
+  dbus-service:
     contents:
       /usr/libexec/netplan/netplan-dbus:
       /usr/share/dbus-1/system-services/io.netplan.Netplan.service:

tests/spread/integration/iproute2/task.yaml

@@ -0,0 +1,15 @@
+summary: Integration tests for iproute2
+
+execute: |
+  # Chisel a minimum number of slices to give us a runnable system that we can
+  # test in.
+  rootfs="$(install-slices bash_bins passwd_config base-files_base grep_bins iproute2_bins)"
+  
+  # iproute2 needs dev mounted
+  mkdir "${rootfs}"/dev
+  mount --rbind /dev "${rootfs}"/dev
+
+  cp test.sh "${rootfs}/"
+  chroot "${rootfs}/" /test.sh
+
+  umount -l "${rootfs}"/dev

tests/spread/integration/iproute2/test.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# smoketest ip commands
+ip --help | grep "Usage:"
+
+# test some basic commands and against loopback that
+# we can kinda expect is there
+ip link | grep "LOOPBACK,UP"
+ip addr | grep "inet 127.0.0.1"
+ip route | grep -E "default via [0-9\.]+"
+
+# iproute carries many binaries
+# so maybe extend as needed

tests/spread/integration/netplan.io/task.yaml

@@ -0,0 +1,19 @@
+summary: Integration tests for netplan.io
+
+execute: |
+  # Chisel a minimum number of slices to give us a runnable system that we can
+  # test in.
+  rootfs="$(install-slices bash_bins coreutils_bins passwd_config base-files_base grep_bins netplan.io_bins)"
+  
+  # netplan needs proc and dev mounted
+  mkdir "${rootfs}"/proc
+  mount -t proc /proc "${rootfs}"/proc
+
+  mkdir "${rootfs}"/dev
+  mount --rbind /dev "${rootfs}"/dev
+
+  cp test.sh "${rootfs}/"
+  chroot "${rootfs}/" /test.sh
+
+  umount -l "${rootfs}"/dev
+  umount "${rootfs}"/proc

tests/spread/integration/netplan.io/test.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# smoketest a couple of netplan commands
+netplan --help | grep "Network configuration in YAML"
+netplan info | grep "features"
+
+# 'netplan generate' needs udevadm to work
+# 'netplan apply' needs udevadm to work
+# 'netplan status' does not properly work inside chroot