Merge "Fix packaging problems for Debian"

elements/debian-minimal/element-deps

@@ -1 +1,2 @@
 debootstrap
+pkg-map

elements/debian-minimal/environment.d/10-debian-minimal.bash

@@ -1,5 +1,5 @@
 export DISTRO_NAME=debian
-export DIB_RELEASE=${DIB_RELEASE:-unstable}
+export DIB_RELEASE=${DIB_RELEASE:-stable}
 export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://httpredir.debian.org/debian}
 export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main}
 export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ }
@@ -11,7 +11,7 @@ updates:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE}-updates ${DIB_DEBIAN_COMPO
 security:deb http://security.debian.org/ ${DIB_RELEASE}/updates ${DIB_DEBIAN_COMPONENTS_WS}
 "
 
-if [ "${DIB_RELEASE}" = "unstable" ]; then
+if [ "${DIB_RELEASE}" = "testing" -o "${DIB_RELEASE}" = "unstable" ]; then
     DIB_APT_SOURCES_CONF_DEFAULT="default:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE} ${DIB_DEBIAN_COMPONENTS_WS}"
 fi
 

elements/debian-minimal/package-installs.yaml

@@ -0,0 +1,2 @@
+systemd:
+systemd-sysv:

elements/debian-minimal/pkg-map

@@ -0,0 +1,14 @@
+{
+  "release": {
+    "debian": {
+      "testing": {
+        "systemd": "systemd",
+        "systemd-sysv": "systemd-sysv"
+       }
+     }
+   },
+  "default": {
+    "systemd": "",
+    "systemd-sysv": ""
+  }
+}

elements/debian-minimal/test-elements/stable-build-succeeds/README.rst

@@ -0,0 +1 @@
+Verify we can build a debian-minimal stable image.

elements/debian-minimal/test-elements/stable-build-succeeds/environment.d/10-set-distro.bash

@@ -0,0 +1,2 @@
+export DISTRO_NAME=debian
+export DIB_RELEASE=stable

elements/debian-minimal/test-elements/testing-build-succeeds/README.rst

@@ -0,0 +1 @@
+Verify we can build a debian-minimal stable image.

elements/debian-minimal/test-elements/testing-build-succeeds/environment.d/10-set-distro.bash

@@ -0,0 +1,2 @@
+export DISTRO_NAME=debian
+export DIB_RELEASE=testing

elements/debootstrap/root.d/08-debootstrap

@@ -59,9 +59,10 @@ else
 
     # Have to --include=python because of dib-run-parts
     # Have to --include=sudo for pre-install.d use of sudoers files
+    # Have to --include=busybox because initramfs needs it
     sudo sh -c "http_proxy=$http_proxy debootstrap --verbose \
         --variant=minbase \
-        --include=python,sudo,$KERNEL_PACKAGE \
+        --include=python,sudo,busybox,$KERNEL_PACKAGE \
         --components=${DIB_DEBIAN_COMPONENTS} \
         --arch=${ARCH} \
         $KEYRING_OPT \

tests/run_functests.sh

@@ -18,6 +18,9 @@ DEFAULT_SKIP_TESTS=(
     fedora/build-succeeds
     # in non-voting
     gentoo/build-succeeds
+    # good to have the test case around - but because of changes
+    # in testing does not work always.
+    debian-minimal/testing-build-succeeds
 )
 
 # run_disk_element_test <test_element> <element>