From 65149c1394744eac24e5787988f63c916a6ca355 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 7 Nov 2023 10:03:35 +0100 Subject: [PATCH 1/2] docker: skip new device mapper test for LTS 2022 Signed-off-by: Mathieu Tortuyaux --- kola/tests/docker/docker.go | 1 + 1 file changed, 1 insertion(+) diff --git a/kola/tests/docker/docker.go b/kola/tests/docker/docker.go index 90fd6b95e..3cb3e06b7 100644 --- a/kola/tests/docker/docker.go +++ b/kola/tests/docker/docker.go @@ -188,6 +188,7 @@ systemd: }) register.Register(®ister.Test{ + MinVersion: semver.Version{Major: 3034}, Run: func(c cluster.TestCluster) { testDockerInfo("devicemapper", c) }, ClusterSize: 1, Name: "docker.devicemapper-storage", From 35e0b7ce71f7a6cb2609759c6f32e935f7dca220 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 7 Nov 2023 10:10:37 +0100 Subject: [PATCH 2/2] docker: revert config to CLC to continue testing LTS2022 Signed-off-by: Mathieu Tortuyaux --- kola/tests/docker/docker.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kola/tests/docker/docker.go b/kola/tests/docker/docker.go index 3cb3e06b7..ab648f7b4 100644 --- a/kola/tests/docker/docker.go +++ b/kola/tests/docker/docker.go @@ -143,13 +143,11 @@ passwd: Platforms: []string{"qemu", "qemu-unpriv"}, // Note: copied verbatim from https://github.com/coreos/docs/blob/master/os/mounting-storage.md#creating-and-mounting-a-btrfs-volume-file // Added explicit btrfs driver selection because overlay2 is the default for btrfs FS in docker 23 and above - UserData: conf.Butane(` -variant: flatcar -version: 1.0.0 - + UserData: conf.ContainerLinuxConfig(` storage: files: - path: /etc/docker/daemon.json + filesystem: root contents: inline: | { @@ -159,7 +157,7 @@ storage: systemd: units: - name: format-var-lib-docker.service - enabled: true + enable: true contents: | [Unit] Before=docker.service var-lib-docker.mount @@ -171,7 +169,7 @@ systemd: [Install] WantedBy=multi-user.target - name: var-lib-docker.mount - enabled: true + enable: true contents: | [Unit] Before=docker.service