Commit Graph

81 Commits

Author SHA1 Message Date
Michael Hudson-Doyle cf931f673f update script to update exsting checkout 2021-07-05 09:23:39 +12:00
Michael Hudson-Doyle 50ce450f2a add a gitdeps target to Makefile that checks out probert and curtin
This uses a silly python script to get the exact version that the
snapcraft.yaml specifies.
2021-07-02 13:48:49 +12:00
Dan Bungert 657f27ebf9
Rearrange makefile targets (#960)
Skip a recursive make step and simplify a bit.
Add dryrun-server.
Also an unrelated whitespace fix.
2021-05-25 16:59:22 -06:00
Dan Bungert 4f9de12556
Split unit / integration tests a bit (#956)
Unit tests should be quick and run frequently.
Integration tests can be longer and run less often.
Split them up.
2021-05-17 07:31:29 -06:00
Dan Bungert d04b6a9a3e
dryrun: use the simple machine config (#952)
`make dryrun` will now use the simple sample machine config instead of
probing local hardware.   That local probe only seems to be viable
anyhow if we're running as root, and that's vulnerable to real problems
if dryrun is less than 100% insulated from making real machine changes.
2021-05-12 16:23:58 -06:00
Dan Bungert f823a1243f Generate schema json file on `make schema` 2021-03-03 11:30:43 -07:00
Michael Hudson-Doyle d448adb1c1 probert moved to the canonical github org a while ago 2021-02-19 10:33:38 +13:00
Marcus Tomlinson 927c324e0a Fix make install_deps and make unit/check 2020-11-09 12:40:39 +00:00
Michael Hudson-Doyle 85b35c9e87 steal contextlib from Python 3.8
Python 3.6's does not have asynccontextmanager.
2020-09-11 16:55:26 +12:00
Foster "Forst" Snowhill ec1fa0fe01
Makefile: add xorriso and isolinux to install_deps
In order to use the inject-subiquity-snap.sh script, we need some extra dependencies: xorriso and isolinux.

When xorriso is missing, the following error occurs:

    ./scripts/inject-subiquity-snap.sh: line 184: xorriso: command not found

When isolinux is missing, the image build step for x86-64 is failing:

    xorriso : FAILURE : Given path does not exist on disk: -boot_image system_area='/usr/lib/ISOLINUX/isohdpfx.bin'

This file is not present in the source ISO image, so it has to come from the isolinux package.
2020-08-02 18:05:34 +02:00
Michael Hudson-Doyle a05b030085 fix lint 2020-05-08 15:44:07 +12:00
Dimitri John Ledkov 2e85a2ecd6 i18n: add scripts to help with translation updates.
Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
2020-05-06 13:22:13 +01:00
Michael Hudson-Doyle 46c539c924 make "make schema" output be just the schema and nothing else 2020-04-08 20:53:35 +12:00
Maciej Borzecki 93ac6b94a3 Merge remote-tracking branch 'upstream/master' into bboozzoo/uc20-recovery-chooser 2020-03-31 17:14:28 +02:00
Michael Hudson-Doyle 170f44663e actually validate version field, reduce indentation a bit 2020-03-30 11:05:51 +13:00
Maciej Borzecki a147c720ba console_conf: run as recovery chooser when --recovery-chooser-mode is provided
Add support for --recover-chooser-mode command line argument. When provided, run
as a recovery chooser, rather than as a regular console-conf instance.

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
2020-03-24 15:09:50 +01:00
Dimitri John Ledkov 88dd0e021f Update clean target to regenerate .pot 2020-03-10 12:00:13 +00:00
Michael Hudson-Doyle 9322184af6 have "make install_deps" install some recently added deps 2019-12-12 10:26:57 +13:00
Michael Hudson-Doyle 05f9b10974 Replace --uefi with --bootloader to select any bootloader style for dry-run
Relatedly, make 'MAKE_BOOT in disk.supported_actions' depend on
bootloader style not architecture.
2019-05-13 09:27:12 +12:00
Seth Fitzsimmons 51d0461071 Add jsonschema dependency 2018-07-02 12:39:52 -07:00
Scott Moser 74a5f16535
Add main to subiquity, and use it frm make ui-view.
Add a main to subiquity so that you can run subiquity with:
 python3 -m subiquity
2018-06-06 14:30:03 -04:00
Scott Moser af94275618 Make tox and Makefile more similar.
This does a few things with the end goal of making simplifying and
making consistent tox and 'make' methods of test or check.

Things here:
 * move python programs out of bin and into their own main.  Use
   entry_points to get scripts written for them.  One gain here is
   that we no longer have python programs that are not named .py.
   flake8 and friends would not check those programs by default.
 * install scripts in bin/ using the setup.py scripts and adjust
   snapcraft.yaml and debian packaging for that.
 * declare and use PYTHON in Makefile to avoid repeating 'python3'
 * declare and use CHECK_DIRS in Makefile for list of dirs to check.
 * no longer run 'flake8' from 'make check' by default.
 * remove the old tests/ directory.
2018-06-05 22:19:17 -04:00
Michael Hudson-Doyle 8e50ce252c Merge branch 'master' into mwhudson/snap-screen 2018-05-25 11:44:19 +12:00
Michael Hudson-Doyle 293793fa49 merge master 2018-05-25 11:06:23 +12:00
Michael Hudson-Doyle 43f581bca4 update travis jobs: test on cosmic, run make lint 2018-05-25 10:56:01 +12:00
Ryan Harper 618142f132 Rework make lint target to use pep8 pyflakes3 targets 2018-05-24 16:59:32 -05:00
Ryan Harper acd24c0796 Add pep8 script 2018-05-24 16:51:51 -05:00
Ryan Harper 0849db7c14 Add pyflakes3 target and script 2018-05-24 16:51:49 -05:00
Scott Moser d71cb7cadf Makefile: Always put PYTHONPATH into environment
Just use 'export PYTHONPATH' in the Makefile so that we all targets
have that in their environment.
2018-05-24 12:47:16 -04:00
Michael Hudson-Doyle 676d22482e note new dependencies in a few places 2018-05-22 23:15:13 +12:00
Med 34d25041c7
install_deps target without confirmation 2018-05-18 00:25:41 +02:00
Michael Hudson-Doyle a9555fed5d update dependencies 2018-02-15 13:27:56 +13:00
Michael Hudson-Doyle 7d134ebe6c fix make dryrun at least a little 2018-02-15 11:40:50 +13:00
Scott Moser 4fe72f586f Makefile: tabs not spaces.
Running 'make install_deps' will complain with:
  Makefile:49: *** missing separator (did you mean TAB instead of 8 spaces?).
2017-09-22 14:28:55 -04:00
Michael Hudson-Doyle 794dd71ed5 remove lots of things from Makefile now ./installer is gone 2017-09-14 11:11:25 +12:00
Michael Hudson-Doyle a54100d85d more things you need to build probert now 2017-01-26 12:06:05 +13:00
Michael Hudson-Doyle 3be72ca3be need pkg-config 2017-01-26 11:47:17 +13:00
Michael Hudson-Doyle d3ad1d94f8 change probert url in Makefile to https 2017-01-26 11:46:05 +13:00
Michael Hudson-Doyle ad9517722e simplify makefile 2017-01-26 11:29:20 +13:00
Michael Hudson-Doyle 8ede2d730c and with that, we no longer depend on tornado 2017-01-18 12:02:34 +13:00
Michael Hudson-Doyle 31b21799b7 remove dependency on netifaces 2016-11-07 16:56:36 +13:00
Mathieu Trudel-Lapierre 6ae734302f Makefile: use xenial branch for Makefile builds 2016-07-06 18:27:26 -04:00
Mathieu Trudel-Lapierre e1970b6477 Rename subiquity to subiquitycore -- will serve as base classes for everything
Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
2016-06-30 14:17:01 -04:00
Mathieu Trudel-Lapierre a721eba5c1 Add an 'install' mode; firstboot will be the default to avoid trashing installs
Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
2016-06-28 11:30:40 -04:00
Mathieu Trudel-Lapierre 5b86abca12 Use git+ssh and a newer snapshot revision to get probert.
Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
2016-06-23 23:29:34 +03:00
Ryan Harper 153f41c989 Fix installer to work with latest curtin
The latest curtin now does package dep checks during installation
which may install and enable things like lvm2 and mdadm.  These
packages trigger running daemons which prevent the unmounting of
filesystem when building the installer image.  Resolve this by
re-implementing curtin's [un]disable_daemon_in_root functions.

Update runinstaller to use 3 spare disks as virtio to enable
raid testing.

Signed-off-by: Ryan Harper <ryan.harper@canonical.com>
2015-12-04 09:01:19 -06:00
Ryan Harper 1b66a555ae Makefile: add make check
make check now calls lint and unit

Signed-off-by: Ryan Harper <ryan.harper@canonical.com>
2015-11-02 16:49:31 -06:00
Ryan Harper 9296df7501 make lint: run flake8 via python3
Running flake8 via python3 triggers python3 level of lint checking.
This fixes at least the case where python2 flags the '_*' expander.

Signed-off-by: Ryan Harper <ryan.harper@canonical.com>
2015-11-02 15:27:14 -06:00
Ryan Harper 1327b86d5e Makefile: extract version from python source
Pull subiquity version from the python module.

Signed-off-by: Ryan Harper <ryan.harper@canonical.com>
2015-10-28 10:12:06 -05:00
Ryan Harper b09f273450 Handle raid installer files
Ignore and clean new target files used to test
raid features.

Signed-off-by: Ryan Harper <ryan.harper@canonical.com>
2015-10-27 10:12:28 -05:00