Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: fix some issues with LTS 2022 #479

Merged
merged 2 commits into from
Nov 7, 2023
Merged

docker: fix some issues with LTS 2022 #479

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65149c1
docker: skip new device mapper test for LTS 2022
tormath1 Nov 7, 2023
35e0b7c
docker: revert config to CLC to continue testing LTS2022
tormath1 Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions kola/tests/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
{
Expand All @@ -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
Expand All @@ -171,7 +169,7 @@ systemd:
[Install]
WantedBy=multi-user.target
- name: var-lib-docker.mount
enabled: true
enable: true
contents: |
[Unit]
Before=docker.service
Expand All @@ -188,6 +186,7 @@ systemd:
})

register.Register(&register.Test{
MinVersion: semver.Version{Major: 3034},
Run: func(c cluster.TestCluster) { testDockerInfo("devicemapper", c) },
ClusterSize: 1,
Name: "docker.devicemapper-storage",
Expand Down