| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This means that Morph no longer requires changes to be pushed in order
to build them.
The repos from the system branch are currently cached in the local
repo cache as part of the build process, which is far from ideal.
Tests for 'morph build' now test build without push. The build
metadata now includes a repo path that is inside the TMPDIR, so the
tests have been rewritten to avoid having any hardcoded cache keys
because the cache keys are no longer static.
|
| |
|
|
|
|
| |
Some tests were using test:morphs-repo instead.
|
|
|
|
|
|
|
|
|
|
| |
Some tests already used test: and in order to be able to share the
scripts/setup-3rd-party-strata script they need to all use the same
prefix.
Using baserock: implies that we are using real code from Baserock,
so I picked test: because the tests only ever use mock morphologies
and no real code.
|
| |
|
|\
| |
| |
| | |
Reviewed-By: Lars Wirzenius (on IRC)
|
|/
|
|
|
|
|
|
|
|
|
| |
The test tests.merging/rename-stratum could potentially trigger two
different errors in Morph, based on the order that the systems in the
root repo were processed.
This meant that the test would sometimes spuriously fail if TMPDIR
was manually set, because of differences in the way file systems work.
To fix the root cause requires proper 3-way merging, really.
|
|\ |
|
|/
|
|
|
|
| |
BranchAndMergePlugin.load_morphology() would crash if a parse error
occurred while reading a morphology from a specific revision in git,
instead of from on disk.
|
| |
|
|\
| |
| |
| |
| |
| | |
'remotes/origin/baserock/richardmaw/allow-smaller-tmpdir'
Signed-off-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
|
| |
| |
| |
| |
| |
| | |
This reduces the space required from the full size of the compressed
disk image, which meant that tests could not be run on systems where
TMPDIR is a smallish tmpfs.
|
|\ \ |
|
| | | |
|
|\ \ \
| |/ /
|/| | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It would be nice to put every option in a group, but for now the built-in
cliapp options cannot be grouped so the output is less than ideal.
Also, we have no way of setting an order for groups, which results in e.g.
'Advanced Options' preceeding 'General Options' etc.
|
| | |
| | |
| | |
| | |
| | | |
Make sure all commands have one line of description, and reduce the
size of some which had large amounts of text.
|
| | |
| | |
| | |
| | |
| | |
| | | |
We have several plugins now that can be used as examples, and since
cliapp does not yet support hiding commands Morph currently has a
futile 'morph hello' command listed in --help.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Also remove the '--ignore-submodules' option, which is redundant.
Hopefully cliapp will one day support option grouping, so we can
hide some sets by default and group eg. all the logging options
together.
|
| |/
|/|
| |
| | |
Merge is by far the most complex of the branching and merging commands.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The output of the list-tree depended on the value of TMPDIR.
Instead we replace this with a test that the required directory exists.
merge-with-stratum-renamed also fails with a TMPDIR different to /tmp,
but I have no idea why.
Signed off by Daniel Silverstone in person
|
|\ \
| |/
|/|
| | |
git://git.baserock.org/baserock/morph
|
|/
|
|
|
|
| |
This is intended to for human consumption, with the full set of
metadata in /baserock/system-artifact-name.meta. It currently lists
system name, the symbolic ref of the system morphology and build date.
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
git://git.baserock.org/baserock/morph
This includes a fixup of shell quoting in tests.as-root/lib.
Tests needs to be run with a larget TMPDIR than systemd's default,
since system images can be large.
|
|/
|
|
|
|
|
|
| |
This makes it easier to identify what version of a system we are running.
Tests are updated to check inside the contents of the rootfs we created,
and the code to mount the rootfs as a loopback device was extracted out
into tests.as-root/lib
|
|\
| |
| |
| | |
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
|
| |
| |
| |
| |
| | |
Output needs to be stable, not least so that the test doesn't fail
sporadically.
|
|\ \
| |/
|/|
| | |
git://git.baserock.org/baserock/morph
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
This change causes 'morph petrify' to avoid petrifying any chunk whose
ref matches the current system branch, because it makes no sense to
petrify something that is also being edited. It also improves efficiency
slightly and adds warning where different systems point to different
refs of the same stratum.
A non-obvious effect of this is that if you try to petrify 'master',
many of the chunks won't get petrified because they are built from
'master'. However, petrifying master makes no sense so I'm not sure
that we need to worry.
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Previously if the user had renamed the directory holding the root
repository, the commands would break tragically.
Also fix find_repository() to avoid aborting if it encounters a git
repo in the branch checkout that wasn't put there by Morph.
|
| | |
|
| |
| |
| |
| | |
This provides a user-friendly summary of the workspace or branch status.
|
|/
|
|
|
| |
Users do not need these now due to 'morph status' existing. However, they
are still useful for scripts to call.
|
|\ |
|
| | |
|
| | |
|
|/
|
|
|
| |
This fixes a bunch of tests so they pass on squeeze, which has a version
of Python whose GzipFile doesn't support the "with" protocol.
|
|\
| |
| |
| |
| |
| | |
'origin/samthursfield/S4873-warn-when-merge-causes-petrification'
Renamed petrification test slightly as merge fixup.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The concept of a component path is new. This is simply a concise way
of referring to a component in an error message, and looks like this:
base-system-x86_64-generic.bsp-x86_64-generic.linux
We currently only touch the 'edited chunks' in merge_stratum(), i.e.
those in the FROM branch where 'morph edit' was run. However, the
petrification can affect any chunk so there is a new method added to
obtain all components in a morphology. This function also returns the
differences between the two, which we will make use of at a later date.
|
| | |
|
|\ \
| |/
|/| |
|
| | |
|
| | |
|
| | |
|
|/ |
|
|\
| |
| |
| | |
Reviewed-By: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
|