Merge pull request #1118 from marquiz/release-0.9

Support Debian 11 and 12
intel · Sep 6, 2024 · a9e445f · a9e445f
2 parents baad21a + e869cdb
commit a9e445f
Show file tree

Hide file tree

Showing 18 changed files with 62 additions and 10 deletions.
diff --git a/demo/lib/distro.bash b/demo/lib/distro.bash
@@ -132,12 +132,12 @@ ubuntu-24_04-image-url() {
     echo "https://cloud-images.ubuntu.com/releases/noble/release/ubuntu-24.04-server-cloudimg-amd64.img"
 }
 
-debian-10-image-url() {
-    echo "https://cloud.debian.org/images/cloud/buster/latest/debian-10-generic-amd64.qcow2"
+debian-11-image-url() {
+    echo "https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.qcow2"
 }
 
-debian-11-image-url() {
-    echo "https://cloud.debian.org/images/cloud/bullseye/daily/latest/debian-11-generic-amd64-daily.qcow2"
+debian-12-image-url() {
+    echo "https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2"
 }
 
 debian-sid-image-url() {
@@ -257,10 +257,15 @@ debian-install-kernel-dev() {
     echo "install: dpkg -i linux-*.deb"
 }
 
-debian-10-install-containerd-pre() {
+debian-11-install-containerd-pre() {
     debian-install-repo-key https://download.docker.com/linux/debian/gpg
-    debian-install-repo "deb https://download.docker.com/linux/debian buster stable"
+    debian-install-repo "deb https://download.docker.com/linux/debian bullseye stable"
+}
 
+debian-11-install-containerd() {
+    vm-command-q "[ -f /usr/bin/containerd ]" || {
+        distro-install-pkg containerd.io
+    }
 }
 
 debian-sid-install-containerd-post() {

diff --git a/dockerfiles/cross-build/Dockerfile.debian-10 → dockerfiles/cross-build/Dockerfile.debian-11 b/dockerfiles/cross-build/Dockerfile.debian-10 → dockerfiles/cross-build/Dockerfile.debian-11
@@ -1,5 +1,5 @@
 # pull in base + a minimal set of useful packages
-FROM debian:buster as debian-10-build
+FROM debian:bullseye as debian-11-build
 
 ARG GO_VERSION=x.yz
 ARG GOLICENSES_VERSION

diff --git a/dockerfiles/cross-build/Dockerfile.debian-12 b/dockerfiles/cross-build/Dockerfile.debian-12
@@ -0,0 +1,25 @@
+# pull in base + a minimal set of useful packages
+FROM debian:bookworm as debian-11-build
+
+ARG GO_VERSION=x.yz
+ARG GOLICENSES_VERSION
+ARG CREATE_USER="test"
+ARG USER_UID=""
+ENV PATH /go/bin:/usr/local/go/bin:$PATH
+
+# pull in stuff for cgo
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        build-essential fakeroot devscripts \
+        bash git make sed debhelper ca-certificates && \
+    rm -rf /var/lib/apt/lists/*
+
+ADD http://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz /
+
+RUN tar xf /go${GO_VERSION}.linux-amd64.tar.gz -C "/usr/local" && \
+    rm /go${GO_VERSION}.linux-amd64.tar.gz
+
+RUN GOBIN=/go/bin go install github.com/google/go-licenses@${GOLICENSES_VERSION}
+
+RUN [ -n "$CREATE_USER" -a "$CREATE_USER" != "root" ] && \
+    useradd -m -s /bin/bash $CREATE_USER -u $USER_UID
diff --git a/test/e2e/packages.test-suite/debian-10/binsrc.var b/test/e2e/packages.test-suite/debian-10/binsrc.var
diff --git a/test/e2e/packages.test-suite/debian-10/distro.var b/test/e2e/packages.test-suite/debian-10/distro.var
diff --git a/test/e2e/packages.test-suite/debian-11/binsrc.var b/test/e2e/packages.test-suite/debian-11/binsrc.var
@@ -0,0 +1 @@
+packages/debian-11
diff --git a/...kages.test-suite/debian-10/cri-resmgr.cfg → ...kages.test-suite/debian-11/cri-resmgr.cfg b/...kages.test-suite/debian-10/cri-resmgr.cfg → ...kages.test-suite/debian-11/cri-resmgr.cfg
diff --git a/test/e2e/packages.test-suite/debian-11/distro.var b/test/e2e/packages.test-suite/debian-11/distro.var
@@ -0,0 +1 @@
+debian-11
diff --git a/...ian-10/pkgtest/test01-systemd/code.var.sh → ...ian-11/pkgtest/test01-systemd/code.var.sh b/...ian-10/pkgtest/test01-systemd/code.var.sh → ...ian-11/pkgtest/test01-systemd/code.var.sh
diff --git a/...suite/debian-10/pkgtest/topology.var.json → ...suite/debian-11/pkgtest/topology.var.json b/...suite/debian-10/pkgtest/topology.var.json → ...suite/debian-11/pkgtest/topology.var.json
diff --git a/...-suite/debian-10/reinstall_cri_resmgr.var → ...-suite/debian-11/reinstall_cri_resmgr.var b/...-suite/debian-10/reinstall_cri_resmgr.var → ...-suite/debian-11/reinstall_cri_resmgr.var
diff --git a/test/e2e/packages.test-suite/debian-12/binsrc.var b/test/e2e/packages.test-suite/debian-12/binsrc.var
@@ -0,0 +1 @@
+packages/debian-12
diff --git a/test/e2e/packages.test-suite/debian-12/cri-resmgr.cfg b/test/e2e/packages.test-suite/debian-12/cri-resmgr.cfg
@@ -0,0 +1,6 @@
+policy:
+  Active: topology-aware
+  ReservedResources:
+    CPU: 750m
+logger:
+  Debug: cri-resmgr,resource-manager,cache,policy
diff --git a/test/e2e/packages.test-suite/debian-12/distro.var b/test/e2e/packages.test-suite/debian-12/distro.var
@@ -0,0 +1 @@
+debian-12
diff --git a/test/e2e/packages.test-suite/debian-12/pkgtest/test01-systemd/code.var.sh b/test/e2e/packages.test-suite/debian-12/pkgtest/test01-systemd/code.var.sh
@@ -0,0 +1,10 @@
+# Clear cri-resmgr output from previous runs.
+vm-command "journalctl --vacuum-time=1s"
+
+# Create a pod.
+create besteffort
+
+# Verify that new pod was created by systemd-managed cri-resource-manager.
+vm-command "journalctl -xeu cri-resource-manager | grep 'StartContainer: starting container pod0:pod0c0'" || {
+    command-error "failed to verify that systemd-managed cri-resource-manager launched the pod"
+}
diff --git a/test/e2e/packages.test-suite/debian-12/pkgtest/topology.var.json b/test/e2e/packages.test-suite/debian-12/pkgtest/topology.var.json
@@ -0,0 +1,3 @@
+[
+    {"mem": "2G", "cores": 2, "nodes": 2, "packages": 2}
+]
diff --git a/test/e2e/packages.test-suite/debian-12/reinstall_cri_resmgr.var b/test/e2e/packages.test-suite/debian-12/reinstall_cri_resmgr.var
@@ -0,0 +1 @@
+1
diff --git a/test/e2e/run.sh b/test/e2e/run.sh
@@ -99,7 +99,7 @@ usage() {
     echo "    topology: JSON to override NUMA node list used in tests."
     echo "             See: python3 ${DEMO_LIB_DIR}/topology2qemuopts.py --help"
     echo "    distro:  Linux distribution to be / already installed on vm."
-    echo "             Supported values: debian-10, debian-sid"
+    echo "             Supported values: debian-11, debian-12, debian-sid"
     echo "                 fedora, opensuse-tumbleweed,"
     echo "                 opensuse-15.5 (same as opensuse), sles,"
     echo "                 ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04"