summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make rootfs-tarball build only the tarball also on ARMLars Wirzenius2013-02-202-13/+2
|
* Merge branch 'liw/build-ordering'Sam Thursfield2013-02-199-407/+134
|\
| * Add clarifying commentSam Thursfield2013-02-191-1/+3
| | | | | | | | | | Making the changes mentioned in the comment would be quite invasive, and we don't have to do so quite yet.
| * Rewrite show-dependencies to work without BuildOrderLars Wirzenius2013-02-192-109/+66
| |
| * Stop computing the old build orderingLars Wirzenius2013-02-194-267/+17
| |
| * Replace builder order graph with just a single artifactLars Wirzenius2013-02-194-36/+54
|/ | | | | The artifact's build dependencies replace the build order graph from previously.
* Merge branch 'baserock/richardmaw/fix-edit-build-depends'Sam Thursfield2013-02-136-36/+117
|\
| * Amend tests to trigger failure to recursively update strataRichard Maw2013-02-135-3/+51
| |
| * morph edit: Recursively edit strataRichard Maw2013-02-131-33/+66
| | | | | | | | | | | | | | | | | | | | | | Previously the code would edit strata that dependended on the stratum being edited, but would ignore the dependency chain beyond that. In fact, we need to edit all strata in the dependency chain to avoid having two different versions of a stratum in the same build. This splits the modification into two steps: changing the stratum that points to the chunk, and recursively changing references to any strata that have been altered.
* | Merge branch 'liw/disable-test-on-squeeze'Lars Wirzenius2013-02-121-2/+9
|\ \ | | | | | | | | | Reviewed-By: Richard Maw (in real life)
| * | Disable deployment test on Python 2.6Lars Wirzenius2013-02-121-2/+9
|/ / | | | | | | | | Also, make test use bash instead of sh, so it passes on squeeze as well as Baserock.
* | Merge branch 'liw/deployment-fixes'Lars Wirzenius2013-02-122-2/+3
|\ \ | | | | | | | | | Reviewed-By: Richard Maw (on irc)
| * | Improve message phrasingLars Wirzenius2013-02-121-2/+2
| | | | | | | | | | | | Suggested-By: Richard Maw
| * | Add missing "import sys" to fix error messagesLars Wirzenius2013-02-121-0/+1
|/ / | | | | | | Reported-By: Richard Maw
* | Merge branch 'liw/deployment-refactor' of ↵Richard Maw2013-02-1216-2/+995
|\ \ | | | | | | | | | git://git.baserock.org/baserock/baserock/morph
| * | Add missing argument to create_local_system methodLars Wirzenius2013-02-071-1/+1
| | | | | | | | | | | | Reported-By: Richard Maw
| * | Refactor: Add WriteExtension.create_local_system methodLars Wirzenius2013-02-074-69/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows code sharing amongst all the places that create a system in a raw disk image. This also adds the creation of a factory-run subvolume, and fixes error messages for errors that happen during a disk image creation. Suggested-By: Richard Maw Suggested-By: Sam Thursfield
| * | Remove debugging outputLars Wirzenius2013-02-073-29/+0
| | | | | | | | | | | | Suggested-By: Richard Maw
| * | Do away with unnecessary fstab entries for proc, sysLars Wirzenius2013-02-071-2/+0
| | | | | | | | | | | | Suggested-By: Richard Maw
| * | Let mount choose loop deviceLars Wirzenius2013-02-071-2/+1
| | | | | | | | | | | | Suggested-By: Richard Maw
| * | Create hole in-process without executing dd(1)Lars Wirzenius2013-02-071-7/+4
| | | | | | | | | | | | Suggested-By: Richard Maw
| * | Comment logic in _run_extensionLars Wirzenius2013-02-071-0/+3
| | | | | | | | | | | | Suggested-By: Sam Thursfield
| * | Make configuration-extensions have a default valueLars Wirzenius2013-02-072-12/+11
| | | | | | | | | | | | | | | | | | | | | This saves a check (and an indentation) in the deployment plugin, making the code a tiny bit simpler. Suggested-By: Sam Thursfield
| * | Fix docstring and error messageLars Wirzenius2013-02-071-3/+3
| | | | | | | | | | | | Suggested-By: Sam Thursfield
| * | Describe how we re-use code from branch+merge pluginLars Wirzenius2013-02-071-0/+6
| | | | | | | | | | | | Suggested-By: Sam Thursfield
| * | Set PYTHONPATH during testsLars Wirzenius2013-02-061-0/+6
| | | | | | | | | | | | | | | | | | This is necessary so that the write extension run by cmdtest finds the morphlib of the source tree we're running ./check in, rather than the system installed one.
| * | Fix setup.py to also install deployment extensionsLars Wirzenius2013-02-061-0/+1
| | |
| * | Add cmdtest for "morph deploy" and rawdisk.writeLars Wirzenius2013-02-065-5/+278
| | |
| * | Add a write extension for kvm+libvirtLars Wirzenius2013-02-061-0/+140
| | |
| * | Add a write extension for VirtualBoxLars Wirzenius2013-02-061-0/+158
| | |
| * | Add a write extension for raw disk imagesLars Wirzenius2013-02-061-0/+70
| | |
| * | Add a configuration extension for setting hostnameLars Wirzenius2013-02-061-0/+27
| | |
| * | Add morphlib module for common write extension codeLars Wirzenius2013-02-063-0/+160
| | |
| * | Add deployment pluginLars Wirzenius2013-02-064-1/+203
| |/ | | | | | | | | | | | | | | | | | | | | This adds a new optional field to system morphologies: "configuration-extensions". The deployment plugin relies heavily on code from the branch and merge plugin. This needs to be eventually fixed by refactoring the codebase so that the shared code is in morphlib and not in plugins. However, doing that is beyond the scope of adding a deployment plugin.
* | Merge branch 'baserock/richardmaw/branch-from-image-v4'Sam Thursfield2013-02-1111-77/+455
|\ \
| * | git: clone then checkout instead of clone -bRichard Maw2013-02-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Newer versions of git have changed the behaviour when cloning with --branch=$sha1. It used to be nearly synonamous with clone then checkout. The clone then checkout logic is different to the clone with branch logic, since they have different behaviour with regard to the branches that are checked out in the workspace.
| * | Add a black-box test for branch-from-imageRichard Maw2013-02-113-0/+59
| | | | | | | | | | | | | | | | | | | | | The test builds a system, makes a commit to mainline, then branches from the system and checks whether it is petrified to the exact commits that the system was built from by checking the morphology contents and rebuilding the system.
| * | branch and merge: add branch-from-image commandRichard Maw2013-02-111-0/+128
| | | | | | | | | | | | | | | | | | Branch from image takes a directory containing metadata, then creates a branch of what the System was built from and petrifies it to when the System was built.
| * | branch and merge: combine checkout and branch logicRichard Maw2013-02-111-48/+37
| | |
| * | Make petrify more versatile than just making tagsRichard Maw2013-02-111-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | Pass resolved_refs in with the key as a repo, ref pair to petrify to the value, rather than petrifying to the current state of the ref. Set update_working_tree to also change files in the working tree, instead of just the index.
| * | RepoAliasResolver: gimp logging during testsRichard Maw2013-02-111-0/+2
| | | | | | | | | | | | | | | | | | Applications default to logging to console, which causes unwanted output during tests, and I thought this was tidier than allowing tests to override the logger per-call.
| * | RepoAliasResolver: Add aliases_from_url methodRichard Maw2013-02-112-0/+63
| | | | | | | | | | | | This returns a sorted list of possible aliases for a url.
| * | repoaliasresolver: compile patterns on creationRichard Maw2013-02-112-19/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | This also involved codifying it ignoring malformed aliases. Such behaviour was implemented before, but wasn't obvious. The restructuring made it have a line of code of its own, which meant it needed unit testing.
| * | Add a regression test for metadata including repo aliasRichard Maw2013-02-112-0/+97
| | |
| * | Make metadata include the repo-alias.Richard Maw2013-02-112-1/+3
|/ / | | | | | | | | | | | | | | | | This is required for reproducing the morphologies that created the artifacts. It is possible, but expensive, to `unexpand` a url, provided your repository aliases are the same as the morphology's, but this may not always be the case.
* | Merge remote-tracking branch 'origin/samthursfield/morph-name-equals-filename'Lars Wirzenius2013-02-113-90/+37
|\ \
| * | Remove test for name mismatchesSam Thursfield2013-02-081-66/+0
| | | | | | | | | | | | No longer possible for this to happen.
| * | Require morphology name to match filenameSam Thursfield2013-02-082-24/+37
| |/ | | | | | | | | | | | | Allowing differences causes only confusion. Whether or not the 'name' field should surive at all is up for debate: it's very useful when seeing the contents of the morphology out of context (e.g. in documentation or pastebins), but is that worth the extra effort?
* | Merge remote-tracking branch 'origin/baserock/richardmaw/safeyaml'Lars Wirzenius2013-02-111-4/+4
|\ \ | |/ |/|
| * yaml: use Safe Loaders and DumpersRichard Maw2013-02-111-4/+4
|/ | | | | This is equivalent to using yaml.safe_load(), but lets us customise how yaml is parsed.
View Lorry Controller Status