~cgrabowski/maas:fix_lp1982866_3.1_backport

Branch merges

Propose for merging

Merged into maas:3.1

MAAS Lander: Approve on 2022-09-23

MAAS Maintainers: Pending requested 2022-09-23

Diff: 316 lines (+187/-14)

6 files modified

src/maasserver/forms/__init__.py (+17/-4)
src/maasserver/forms/tests/test_bootresource.py (+40/-5)
src/maasserver/models/bootresource.py (+11/-0)
src/maasserver/models/tests/test_bootresource.py (+12/-0)
src/maasserver/rpc/boot.py (+1/-4)
src/maasserver/rpc/tests/test_boot.py (+106/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

cd09b8b... by Christian Grabowski on 2022-03-28

allow arbitrary custom images default to using the commissioning OS for base_image

return commissioning OS as base image for older images without one

(cherry picked from commit 8010f456b9efca00f9be0f215e567a54792bda30)

446f381... by Christian Grabowski on 2022-09-23

use BootResource's method for splitting base image to get a default value in get_boot_config_for_machine()

(cherry picked from commit d58366ec06df69f22273b72338e80e9459ee3f7c)

3d0a11b... by Alberto Donato on 2022-07-12

                  test-related fixes to allow running tests with launchpad-ci

- don't run aa-exec in docker
- require gpg-agent since it's not preinstalled in all images

                  __EOF__
                  rm -r $work_dir

aec2d81... by Adam Collard on 2022-06-28

LP:1978154: Don't require netplan for custom CentOS images

We erroneously checked custom CentOS images for netplan, remove that.

Switch to using `rpm -q` for package installation (a more reaonable
translation of `dpkq-query -s`)

Validate RHEL based custom images too.

(cherry picked from commit 9877850af9d3ba9d281b5de9518c9997d0d25dc9 )

059e2a3... by Alberto Donato on 2022-05-31

use 3.1-next PPA for deps

d5a2b49... by Mauricio Faria de Oliveira on 2022-05-24

[cherry-pick from commit 9eef25a55a36 ("LP:1958433 curtin workaround for xfs in centos70")]

LP:1958433 curtin workaround for xfs in centos70

The XFS implementation in CentOS 7 does not support the reflink feature,
and refuses to mount with it, leaving the system boot in emergency mode.

So, if 'mkfs.xfs' in the commissioning image (used for deployment) knows
about 'reflink=0|1', create a wrapper to use '-m reflink=0' for CentOS 7.

The commands to generate the wrapper are general, long, and unoptimized,
for better compatibility between Bionic/Focal/Jammy comissioning images.

Example with Focal:

    ...
    Welcome to Ubuntu 20.04.4 LTS!
    ...
    [ 53.426717] cloud-init[1423]: start: cmd-install/stage-early: preparing for installation
    [ 53.432717] cloud-init[1423]: start: cmd-install/stage-early/centos70_xfs_lp1958433: running '/bin/sh -c if [ "centos70" = "centos70" ] && mkfs.xfs 2>&1 | grep -q "reflink=0|1"; then WRAPPER=/usr/local/sbin/mkfs.xfs; echo "#!/bin/sh" >$WRAPPER && echo "exec $(which mkfs.xfs) -m reflink=0 \"\$@\"" >>$WRAPPER && chmod +x $WRAPPER && echo "Wrapper: $WRAPPER" && cat $WRAPPER; fi'
    [ 53.476110] cloud-init[1423]: Wrapper: /usr/local/sbin/mkfs.xfs
    [ 53.478272] cloud-init[1423]: #!/bin/sh
    [ 53.478767] cloud-init[1423]: exec /usr/sbin/mkfs.xfs -m reflink=0 "$@"
    [ 53.479615] cloud-init[1423]: finish: cmd-install/stage-early/centos70_xfs_lp1958433: SUCCESS: running '/bin/sh -c if [ "centos70" = "centos70" ] && mkfs.xfs 2>&1 | grep -q "reflink=0|1"; then WRAPPER=/usr/local/sbin/mkfs.xfs; echo "#!/bin/sh" >$WRAPPER && echo "exec $(which mkfs.xfs) -m reflink=0 \"\$@\"" >>$WRAPPER && chmod +x $WRAPPER && echo "Wrapper: $WRAPPER" && cat $WRAPPER; fi'
    [ 53.485237] cloud-init[1423]: centos70_xfs_lp1958433 took 0.053 seconds
    [ 53.485435] cloud-init[1423]: stage_early took 0.053 seconds
    [ 53.485889] cloud-init[1423]: finish: cmd-install/stage-early: SUCCESS: preparing for installation
    ...
    [ 63.756098] cloud-init[1423]: Running command ['mkfs.xfs', '-f', '-L', '', '-m', 'uuid=42e5ad8a-f078-48d2-8d42-60ee2ef10641', '/dev/vda3'] with allowed return codes [0] (capture=True)
    [ 63.758788] cloud-init[1423]: Formated device type: partition
    [ 63.763745] cloud-init[1423]: finish: cmd-install/stage-partitioning/builtin/cmd-block-meta: SUCCESS: configuring format: vda-part3_format
    ...

Signed-off-by: Mauricio Faria de Oliveira <email address hidden>

d8ea51a... by Alexsander de Souza on 2022-05-11

Add sampledata generator and perf tests to MAAS 3.1

8049d20... by Alberto Donato on 2021-12-17

deb: bump minimum versions for some dependencies

f1f8f15... by huwshimi <email address hidden> on 2021-11-24

Update maas-ui to 91b8c124
chore(all): update the maas-ui version to 3.1.0 (#3319)

* chore(all): update the maas-ui version

* Run CI against the 3.1 branch.

4e68e41... by Alberto Donato on 2021-11-23

bump version to 3.1.0