launchpad-reviewers team mailing list archive

[Colin Watson <mp+433600@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-hybrid-cgroup-hierarchy into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
Disable unified cgroup hierarchy on builders

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-mojo-specs/+git/private/+merge/433600

Ubuntu 22.04's systemd defaults to the unified cgroup hierarchy, but this causes problems when running containers of some older series, which builders have to retain the ability to do.  Switch back to the hybrid hierarchy, as used on Ubuntu 20.04.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-hybrid-cgroup-hierarchy into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 4b1b98e..62768b7 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -236,12 +236,13 @@ applications:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
+      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
 {%- if stage_name == "staging" %}
   launchpad-buildd-image-modifier-bos01-arm64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
-      linux-command-line-extra: compat_uts_machine=armv7l
+      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false compat_uts_machine=armv7l"
       remote-modifiers: '{{ modifiers_bos01 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
@@ -249,6 +250,7 @@ applications:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
+      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
       remote-modifiers: '{{ modifiers_bos01 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
@@ -256,6 +258,7 @@ applications:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
+      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
       remote-modifiers: '{{ modifiers_bos01 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
@@ -264,7 +267,7 @@ applications:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
-      linux-command-line-extra: compat_uts_machine=armv7l
+      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false compat_uts_machine=armv7l"
       remote-modifiers: '{{ modifiers_bos02 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
@@ -272,6 +275,7 @@ applications:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
+      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
       remote-modifiers: '{{ modifiers_bos02 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
@@ -279,6 +283,7 @@ applications:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
+      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
       remote-modifiers: '{{ modifiers_bos02 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub