summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Escape special characters and handle whitespace in gitattributesbaserock/adamcoldrick/git-fat-handle-whitespace-rebaseAdam Coldrick2014-04-021-1/+21
| | | | | | | | | | | | | | | | Since git's parsing of .gitattributes can't deal with spaces, or even with quotes, replace any whitespace with [[:space:]]. Also, make sure to escape any glob metacharacters to avoid accidental pattern matches. Note: This approach could cause a file "foo<tab>bar" to be treated as a binary if a file "foo bar" has already been added with morph add-binary. However this is as good of a workaround as I can find. Signed-off by: Adam Coldrick
* Merge branch 'baserock/richardipsum/merge_distbuild'Richard Ipsum2014-03-2736-13/+4703
|\ | | | | | | | | | | | | | | | | | | Conflicts: morphlib/plugins/deploy_plugin.py without-test-modules Reviewed by: Richard Maw Lars Wirzenius
| * UI change: distbuild has its own subcommandRichard Ipsum2014-03-261-7/+39
| |
| * Remove Initiator and InitiatorBuildCommandRichard Ipsum2014-03-261-49/+0
| |
| * Bring InitiatorBuildCommand into buildcommandRichard Ipsum2014-03-261-0/+30
| |
| * Fix deployRichard Ipsum2014-03-261-2/+3
| | | | | | | | | | | | | | | | | | tarfile's open needs the file-like object to have a tell() method, objects returned from sockets don't have this method. So instead we fetch the artifact from the remote and cache it locally
| * Make morph install distbuildRichard Ipsum2014-03-261-3/+3
| |
| * Make InitiatorBuildCommand construct BuildCommandRichard Ipsum2014-03-261-0/+1
| | | | | | | | | | | | | | The constructor for BuildCommand sets up the caches, we want the caches to be set up for distbuild too so that we can deploy a system (system artifact will be fetched from the artifact cache)
| * Transfer all chunk artifacts after they are builtRichard Ipsum2014-03-261-10/+15
| | | | | | | | | | We want to be able to transfer all source artifacts in a single transaction
| * Fix build controllerRichard Ipsum2014-03-261-6/+34
| | | | | | | | | | | | | | | | | | | | Whenever the controller finds a source artifact it wants to build, it changes its state to BUILDING. We build all a chunk's source artifacts in one go. So for any chunk artifact, we change the state of all chunk artifacts that are built from the same source to BUILDING
| * Make serialise work with artifact splittingRichard Ipsum2014-03-261-26/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serialisation was simple when we only had 1 artifact per source. However, to allow smaller systems, we need artifact splitting to produce multiple artifacts per chunk source. So now the new serialisation format has a separate list of artifacts and sources, rather than the Source being generated from the artifact's serialisation. Python's id() function is used to encode the references between the various Sources and Artifacts, these are replaced with a reference to the new object after deserialisation. Previously the cache-key was used, but this is no longer sufficient to uniquely identify an Artifact. The resultant build graph after deserialisation is a little different to what went in: Strata end up with a different Source per Artifact, so it _is_ a 1 to 1 mapping, as opposed to Chunks, where it's many to 1. We serialise strata and chunks differently because stratum artifacts from the same source can have different dependencies, for example core-devel can have different dependencies to core-runtime. Without intervention we would serialise core-devel and core-devel's dependencies without including core-runtime's dependencies. To solve this we've decided to encode stratum artifacts completely indepedently: each stratum artifact has its own source. This is safe because stratum artifacts can be constructed independently, as opposed to Chunks where all the Artifacts for a Source are produced together. This is a little hacky in its current form, but it simplifies matters later in distbuild with regards to how it handles expressing that every Artifact that shares a Source is built together. Arguably, this should be the output of producing the build graph anyway, since it more helpfully represents which Artifacts are built together than checking the morphology kind all the time, but more assumptions need checking in morph before it's safe to make this change across the whole of the morph codebase.
| * Don't print worker in initiatorRichard Ipsum2014-03-261-2/+0
| | | | | | | | Worker name is not sent in message
| * Fix push_build_branchesRichard Ipsum2014-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | A semantic error in the BuildBranch class meant that it was not possible to push temporary branches. This escaped testing since BuildBranch interacts too tightly with other components to be easily unit-tested, so testing was deferred to a yarn test. However, coverage isn't measured in yarn tests, so this code path was forgotten.
| * Add distbuild-helperRichard Ipsum2014-03-211-0/+322
| |
| * Don't test distbuild pluginRichard Ipsum2014-03-211-0/+1
| |
| * Add the distbuild pluginRichard Ipsum2014-03-211-0/+343
| |
| * Add the distbuild libsRichard Ipsum2014-03-2128-0/+3886
| |
* | Stop using GitDirectory().list_files() to check for .gitfatAdam Coldrick2014-03-251-1/+1
| | | | | | | | | | This function causes a UnicodeDecodeError for some repositories when building. Use os.path.isfile() when looking for .gitfat instead.
* | Merge branch 'sam/nfs-deploy-fixes-2'Sam Thursfield2014-03-242-4/+5
|\ \ | | | | | | | | | | | | Reviewed-By: Daniel Silverstone (on IRC) Reviewed-By: Richard Maw (on IRC)
| * | Use os.environ[] instead of os.environ.get() to read a required variableSam Thursfield2014-03-241-1/+1
| | |
| * | Be consistent with nfsboot_root pathSam Thursfield2014-03-241-3/+4
|/ / | | | | | | | | We were building it from a variable in some places and hardcoding it in others; now we build it from a variable everywhere.
* | Merge branch 'sam/nfs-deploy-fixes'Richard Ipsum2014-03-203-60/+74
|\ \ | | | | | | | | | | | | | | | Reviewed by: Richard Maw Lars Wirzenius
| * | Make sanity checks for nfsboot deployments run earlierSam Thursfield2014-03-182-55/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some code to the '.check' extension to verify that the deployment can happen *before* spending 5 minutes unpacking and configuring the rootfs. This is not a perfect solution yet because when multiple systems are being deployed in a cluster, we do not check all systems and then deploy them all. Instead, we check one, then deploy it, then check the second, etc.
| * | Improve comment in nfsboot.configureSam Thursfield2014-03-181-1/+3
| | |
| * | Remove fstab hack from nfsboot.configureSam Thursfield2014-03-181-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is no longer a default /etc/fstab in the Baserock fhs-dirs chunk, and the nfsboot.write extension does not use the default Btrfs system layout so no entry is added for / to /etc/fstab at deploy-time. We cannot have / in /etc/fstab for nfsboot deployments because it causes systemd to remount / during bootup, which breaks everything.
* | | Merge branch 'baserock/pedroalvarez/system-integration5'Pedro Alvarez2014-03-203-7/+96
|\ \ \ | | | | | | | | | | | | Reviewed-by: Richard Maw
| * | | Run the system integration commands when buildingPedro Alvarez2014-03-201-0/+46
| | | |
| * | | Generate scripts with the system-integration-commands of chunk morphologies.Pedro Alvarez2014-03-201-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scripts will be created into the folder: /baserock/sytem-integration/ The system integration commands have the following syntax: name: linux kind: chunk ... install-commands: ... system-integration: linux-libs: 00-depmod: - depmod -a 70-more-integration: - touch /baserock/FILE - | for FOLDER in $(ls /) do echo "$FOLDER" done linux-misc: 70-more-integration: - echo "Hello world" In this concrete example, the following files will be created: $DESTDIR/baserock/system-integration/ 00-depmod-linux-libs-0000: #!/bin/sh set -xev depmod -a 70-more-integration-linux-libs-0000 #!/bin/sh set -xev touch /baserock/FILE 70-more-integration-linux-libs-0001 #!/bin/sh set -xev for FOLDER in $(ls /) do echo "$FOLDER" done 70-more-integration-linux-misc-0000 #!/bin/sh set -xev echo "Hello world"
| * | | Use morphlib.fsutils.mount when possiblePedro Alvarez2014-03-181-1/+1
| | | |
| * | | Extend morphlib.fsutils.mount to take a fstypePedro Alvarez2014-03-181-3/+7
| |/ /
* | | Merge branch 'adamcoldrick/ingest-binaries-v5-rebase'Adam Coldrick2014-03-206-3/+259
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Author: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed by: * Richard Maw <richard.maw@codethink.co.uk> * Lars Wirzenius <lars.wirzenius@codethink.co.uk> * Richard Ipsum <richard.ipsum@codethink.co.uk>
| * | Implement morph push and morph pulladamcoldrick/ingest-binaries-v5-rebaseAdam Coldrick2014-03-202-0/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a plugin to implement both `morph push` and `morph pull`. These commands are wrappers around the corresponding git commands push and pull, which also implement the functionality of pushing and pulling large files provided by git-fat. For example, running `morph pull` will pull any commits from the remote branch not on your local branch, and then pull any large files from the separate git-fat/rsync store on the Trove.
| * | Implement morph add-binary using git-fat to store large filesAdam Coldrick2014-03-201-0/+110
| | | | | | | | | | | | | | | | | | | | | Add a plugin which implements the morph add-binary command. This command is used to add large files to a git repository. It sets up the files needed to use git-fat, and then runs `git add` with git-fat initiated.
| * | Make existing morph commands use git-fatAdam Coldrick2014-03-203-1/+22
| | | | | | | | | | | | | | | | | | When cloning a repository, the files stored using git-fat need to be pulled. This situation occurs in `morph branch`, `morph edit`, and `morph checkout`.
| * | Add functionality for doing git commands in a directoryAdam Coldrick2014-03-201-2/+32
|/ / | | | | | | | | | | | | | | | | | | | | | | These commands are: * git fat <init|push|pull> * git pull They are required for the morph add-binary and push/pull plugins. Also make sure that GitDirectory is working in the root directory of the specified git repository, and add some helper functions for handling paths of files in the working tree.
* | Merge remote-tracking branch 'origin/baserock/richardmaw/S10630-32-bit-tests'Lars Wirzenius2014-03-1721-266/+97
|\ \
| * | Allow run-in-artifact cmdtest to pass on x86_32Richard Maw2014-03-142-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | This hard-coded the expected artifact key, which is dependent on architecture. Since we don't care about the output, so much as it failing, let's just discard it.
| * | Remove bootstrap-mode cmdtestRichard Maw2014-03-142-56/+0
| | | | | | | | | | | | | | | This is tested in yarns already, and this test breaks the test suite on any architecture but x86_64.
| * | Remove morph tag cmdtestsRichard Maw2014-03-144-177/+0
| | | | | | | | | | | | | | | | | | | | | | | | They hard-code the expected sha1, so break the test suite for anything but x86_64. If we decide tag has a place in the new world order, yarns can be made, but until then, we're better off without these tests.
| * | Raise the disk image size for deployment testRichard Maw2014-03-141-1/+1
| | | | | | | | | | | | Older versions of btrfs fail with just 10M.
| * | Use morph print-architecture to generate morphologiesRichard Maw2014-03-1411-13/+13
| | | | | | | | | | | | | | | uname tends to only give us a valid morph architecture on x86_64, this makes it work on other architectures.
| * | check script: allow fine-grained control of which tests are runRichard Maw2014-03-141-17/+82
|/ / | | | | | | | | | | | | | | | | | | ./check with no arguments is as-before, similarly ./check --full, but now you may also specify individual tests to run. So just the style check is `./check --style`. Everything but style is `./check --full --no-style`. I found this convenient when working on the test suite.
* | Merge branch 'baserock/richardmaw/S10630-multi-deploy-v2'Richard Maw2014-03-1410-116/+368
|\ \ | | | | | | | | | Reviewed-by: Richard Ipsum and Lars Wirzenius
| * | Revert "tests: Allow running ./check on 32-bit x86"Richard Maw2014-03-1416-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f366960273b026322f7e7cc3c1eb0cd632ebc73e. These changes break building on x86_64, which is our main development platform. Better patches will be forthcoming later.
| * | tests: Allow running ./check on 32-bit x86Richard Maw2014-03-1416-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | uname will return the same string morph expects as an architecture on x86_64, but the canonical x86_32 architecture names match i?86 instead. To make it work on 32-bit, we replace calls to uname with morph print-architecture, which does the translation for us.
| * | deploy: Set status prefix to show which deployment the status is forRichard Maw2014-03-141-53/+69
| | |
| * | deploy: Make extension output display which it isRichard Maw2014-03-141-1/+2
| | | | | | | | | | | | This also makes it obey status prefix
| * | Test nested deploymentsRichard Maw2014-03-144-30/+125
| | |
| * | Add sysroot write extensionRichard Maw2014-03-141-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the deployed system to somewhere on the host. Any existing contents of the directory is deleted, so don't try to be clever and deploy a new system on top of / in place of a proper upgrade. It can be used to deploy a chroot, sysroot or container, but its current use is to allow for nested deployments to include another system in itself, since the parent deployment's "$1" is prepended to the sub-deployment's "$2".
| * | scripts: Add helper commands for altering cluster morphologiesRichard Maw2014-03-141-11/+97
| | | | | | | | | | | | | | | | | | These define a vocabulary for altering a cluster morphology's fields, since defining an implementation that is only used by one scenario for setup is cumbersome.