Commit Graph

4632 Commits

Author SHA1 Message Date
Olivier Gayot cf17de1687 Implement backward compatibility mechanism for autoinstall key
In addition to autoinstall_key, controllers can now define an
autoinstall_key_alias.

The purpose of this attribute is to provide a backward compatibility
mechanism when we need to change the name of an autoinstall_key for
whatever reason.

When loading autoinstall data, if we can't find data matching the
autoinstall_key, we will now also look for data matching the key alias.

In the JSON schema, the old name (i.e., autoinstall_key_alias) will be
marked deprecated and the description will have the name of the
replacement key (i.e., autoinstall_key).

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-15 11:44:21 +01:00
Dan Bungert 428dc9502f
Merge pull request #1211 from dbungert/log-dir-perms
logging: 0770 log dir in install env, 0750 later
2022-03-14 10:02:26 -06:00
Dan Bungert 4698dcd935 logging: raise warning when not adjusting perms 2022-03-14 09:48:19 -06:00
Dan Bungert 6c5b038025
Merge pull request #1216 from xypron/os-prober
Installing os-probe requires fakeroot
2022-03-14 08:50:48 -06:00
Heinrich Schuchardt 1a5b96c5be Installing os-probe requires fakeroot
Building with --destructive-mode fails with error:

    dh install
       dh_testroot
    dh_testroot: error: You must run this as root (or use fakeroot).
    make: *** [debian/rules:6: install] Error 255

Use fakeroot for installation.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2022-03-14 15:25:29 +01:00
Heinrich Schuchardt 6114620956
Merge pull request #1215 from xypron/os-prober
atp-deps.txt: add os-prober
2022-03-14 11:25:30 +01:00
Heinrich Schuchardt d823568197 atp-deps.txt: add os-prober
The build instruction contain a step

    PYTHONPATH=probert ./probert/bin/probert --all > mymachine.json

This requires package os-prober.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-03-14 10:27:05 +01:00
Olivier Gayot fb77e05956
Merge pull request #1214 from mwhudson/cloud-init-timeout
catch the correct exception when waiting for cloud-init
2022-03-14 09:43:33 +01:00
Michael Hudson-Doyle 05f3db94a7 catch the correct exception when waiting for cloud-init
Argh!
2022-03-14 12:40:57 +13:00
Dan Bungert 81f0bace6a
Merge pull request #1210 from ogayot/add-python3-systemd
Add python3-systemd as an explicit dependency
2022-03-11 13:10:33 -07:00
Dan Bungert 953998b23a logging: 0770 log dir in install env, 0750 later 2022-03-11 12:44:22 -07:00
Olivier Gayot 1fefa5615a Add python3-systemd as an explicit dependency
Running `make install_depends` does not (always) pull python3-systemd
which is a dependency of Subiquity.

In environments having Install-Recommends enabled, python3-systemd is
pulled by apport which is itself pulled by python3-apport.

Fixed by adding it to the list of dependencies in apt-deps.txt

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-11 17:18:48 +01:00
Michael Hudson-Doyle a4af88ccea
Merge pull request #1207 from dbungert/riscv-curtin
curtin: rev for risc-v apt fix
2022-03-11 13:42:34 +13:00
Dan Bungert 7c296e7084
Merge pull request #1209 from dbungert/probert-timeout
riscv: extend block probing timeout
2022-03-10 15:31:32 -07:00
Michael Hudson-Doyle 68dd1eb660
Merge pull request #1208 from mwhudson/alignment-data-ui
use alignment_data() in PartitionStretchy
2022-03-11 11:22:26 +13:00
Michael Hudson-Doyle 7b36b1907a use alignment_data() in PartitionStretchy
also add alignment_data() to Raid
2022-03-11 10:47:22 +13:00
Dan Bungert 119f17b362 riscv: extend block probing timeout 2022-03-10 14:47:13 -07:00
Dan Bungert 765c65b9bf curtin: rev for risc-v apt fix 2022-03-10 11:08:07 -07:00
Dan Bungert 510d63d93d
Merge pull request #1206 from dbungert/partition-alignment
filesystem: add partition alignment table
2022-03-10 08:47:30 -07:00
Dan Bungert 2d325473ac filesystem: test for gap vs align agreement 2022-03-09 18:29:34 -07:00
Dan Bungert d0ccc98aad filesystem: add alignment data 2022-03-09 17:44:58 -07:00
Dan Bungert a17bd659e2 filesystem: move MiB constant to fix import loop 2022-03-09 17:43:18 -07:00
Dan Bungert 05310f2ffd
Merge pull request #1205 from dbungert/partition-sizing
sizing: scaling funcs usage & constants
2022-03-09 16:23:01 -07:00
Dan Bungert 9554b2471c client fs: drop duplicate constants 2022-03-09 15:06:28 -07:00
Dan Bungert 00d239f2c2 sizing: scaling funcs usage & constants
Move these around so that we don't need a manipulator instance to use.
2022-03-09 14:34:14 -07:00
Olivier Gayot ffc0502e48
Merge pull request #1203 from ogayot/detect-warnings
Better detect server-side warnings / errors in integration tests
2022-03-09 09:23:47 +01:00
Dan Bungert e491da11a0
Merge pull request #1204 from jpnurmi/setxkbmap
keyboard: run setxkbmap for the desktop installer
2022-03-08 13:19:39 -07:00
J-P Nurmi 0a3cd5c40d keyboard: run setxkbmap for the desktop installer 2022-03-08 21:06:14 +01:00
Olivier Gayot 7b5b9506f3
Merge pull request #1202 from ogayot/lsb-jammy
Force ubuntu-advantage screen to show in jammy installer until it is marked LTS
2022-03-08 18:18:51 +01:00
Olivier Gayot 813448683c Enable tracemalloc in integration tests with at most 3 frames
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-08 12:12:07 +01:00
Olivier Gayot a1df5ea409 Make integration tests fail if anything shows up in server-stderr
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-08 12:12:07 +01:00
Olivier Gayot 9856b79f36 Redirect stdout and stderr from server into two distinct files
Instead of having interleaved stdout and stderr in server-output, we now
have respectively:

* stdout redirected to server-stdout
* stderr redirected to server-stderr

This will allow us to monitor for warnings / errors more efficiently.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-08 12:12:07 +01:00
Olivier Gayot 9a5e5b3406
Merge pull request #1201 from ogayot/fix-ud-await
Fix not awaited ubuntu-drivers command existence check
2022-03-08 10:56:31 +01:00
Olivier Gayot 23a66ad335 ubuntu-advantage: handle expiration date with Z time zone suffix
RFC3339 allows dates to use the Z suffix instead of a time zone offset
of 0. Unfortunately, this is not supported by Python
datetime.date.fromisoformat. Work around the issue by replacing the
optional Z character with +00:00 before parsing the date.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-08 10:03:14 +01:00
Olivier Gayot 0af416c388 ubuntu-advantage: show screen on Jammy which is not yet marked LTS
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-08 09:32:03 +01:00
Michael Hudson-Doyle e6d2c8bdb8
Merge pull request #1185 from ogayot/systemd-run
Add option to run commands with private mounts and use it for curtin in-target
2022-03-08 09:34:41 +13:00
Dan Bungert 6927d3bec8
Merge pull request #1199 from dbungert/aptdep-cloudinit
aptdeps: cloud-init, cleanup
2022-03-07 08:14:13 -07:00
Olivier Gayot 45e919eb51 Fix not awaited ubuntu-drivers command existence check
The ensure_cmd_exists() coroutine from ubuntu_drivers was never awaited.
Therefore, the check would always silently succeed. Taking a look in
server-output would show the warning though:

RuntimeWarning: coroutine
'UbuntuDriversHasDriversInterface.ensure_cmd_exists' was never awaited
  self.ubuntu_drivers.ensure_cmd_exists(d.mountpoint)
RuntimeWarning: Enable tracemalloc to get the object allocation traceback

Also, the implementation of ensure_cmd_exists() when
SUBIQUITY_DEBUG=run-drivers is set was failing because we use a shell
builtin as an executable. This was not noticed since ensure_cmd_exists()
was not executed and arun_command() does not check for errors by
default.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-07 15:51:46 +01:00
Olivier Gayot 9bbe592794 Merge remote-tracking branch 'upstream/main' into systemd-run
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-07 10:52:22 +01:00
Dan Bungert c3a8285300 aptdeps: move to external file
This info is redundant, and contained depends in one spot that were not
in the other.  Centralize.
2022-03-04 10:49:23 -07:00
Dan Bungert dbbf43e945 aptdeps: +cloud-init 2022-03-04 10:49:23 -07:00
Dan Bungert c769ae1845
Merge pull request #1198 from jpnurmi/install-deps
Allow calling installdeps.sh from anywhere
2022-03-04 10:49:02 -07:00
J-P Nurmi cbde0a4762 Allow calling installdeps.sh from anywhere
It's nice for the desktop installer contributors to be able to run
"./path/to/subiquity/scripts/installdeps.sh" without changing dir.
2022-03-04 18:35:37 +01:00
Michael Hudson-Doyle d1d3f82be5
Merge pull request #1194 from ogayot/fix-post-drivers
Fix POST to drivers not using payload wrapper for install
2022-03-02 11:12:52 +13:00
Olivier Gayot b63939497d Fix POST to drivers not using payload wrapper for install
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-01 10:32:05 +01:00
Olivier Gayot 2e6fffe02b
Merge pull request #1179 from ogayot/FR-2025
Server-side implementation of third-party drivers
2022-03-01 10:21:59 +01:00
Dan Bungert e35cc87a69
Merge pull request #1193 from dbungert/the-os-prober-saga
os-prober: installer newer version
2022-02-28 16:20:55 -07:00
Dan Bungert 1f8569fcf1
Merge pull request #1176 from dbungert/FR-1182-dual-boot
storage/v2: expose Gap object
2022-02-28 16:20:43 -07:00
Dan Bungert b8db34bb21 test/api: add test for partition to existing table 2022-02-28 16:05:12 -07:00
Dan Bungert 838b83b0b5 test/api: add test for multi-gap case
This test should work once multi-gap is ready, but skip for now since
the gap is reported as one large one.
2022-02-28 16:05:12 -07:00