| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
We will use MorphologyLoader.load_from_file() to load morphologies
from a temporary file, so the output will be unpredictable. That
will break this test, so we may as well convert it into a yarn
to fix it.
|
|
|
|
|
|
| |
This commit fixes an issue where running morph's yarn tests would
leave behind a number of scripts/git-daemon-wrap processes due to
some tests not stopping their git server properly.
|
|
|
|
|
|
|
| |
Fix "attempting to build a system morphology which has never been committed"
use WHEN ... THEN morph succeeded
The old yarn worked just as well, this change is just for consistency.
|
|
|
|
|
| |
Simplify 'deploying a cluster morphology as a tarfile'
and 'attempting to upgrade a tarfile deployment'
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
Existing tests generally request something like
morph build systems/foo-system.morph, now that the system arg is treated
relative to the working directory we must change into the directory that
contains the morphs to run morph build systems/foo-system.morph
|
| |
|
|
|
|
|
| |
These were previously completely untested, so their unsafe mounting
wasn't noticed, but now both are fixed.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
You need both bottle and flup for this to work, and it would wait
forever for a cache-server that is never going to start unless you have
bottle and flup.
So we now check whether the cache server is functional before attempting
distbuild tests.
|
| |
|
|
|
|
| |
Deploying after distbuild currently broken
|
| |
|
| |
|
|
|
|
|
| |
When all the tests that use build-mode: test are gone, the build mode
can be removed.
|
|
|
|
|
|
| |
The arguments to `morph deploy` can get quite long, any way we can make it
shorter and clearer is useful. We can also avoid having the strange
--no-upgrade flag in future.
|
|
|
|
|
|
|
|
|
|
|
| |
Previously we would use file: URIs to point to the git repositories.
This was fast and simple, but had the drawback that it bypassed all the
git cache logic, so changes to the git cache weren't adequately covered
by the test suite.
Now we spool up a simulated git server per scenario, and shut it down at
the end.
|
|
|
|
| |
This replaces an old cmdtest.
|
|
|
|
| |
We're using the wrong morph if we don't use run_morph
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There was a check in it to see whether it needed to do the git branch
and git checkout based on whether the name of the branch matched that in
the morphology.
This had a couple of problems:
1. Now that we aren't always building from HEAD, we need to be able to
roll its commit back, so using the existing branch isn't always the
best idea.
2. It only checks the "ref" field, not "unpetrify-ref", so even though
we clone the right ref in there, it's checking the commit id against
the system branch name, so would always try to re-create the branch,
and fail when it already exists.
So now, we remove the original ref and re-create it with our preferred
HEAD.
A better solution might be to change the clone logic to not
automatically checkout HEAD, and instead require an explicit branch then
checkout, but the initial clone logic is shared with build, and I didn't
feel like tracking down all the different places that it was used.
|
|
|
|
|
|
|
|
|
| |
The help for the show-branch-root command said it returns a path, but
the command and the yarns just showed the aliased url it was cloned
from.
Given I found myself needing the path in some scripts, not the repo url,
I think it's more useful to reconcile the difference this way.
|
|
|
|
|
|
|
|
|
| |
This is closer to our current workflow, where we are always petrified
and update the ref field when we need to update a component.
This required rearranging the operations to create the chunk repository
before the definitions repository, and remove a check that assumes we
weren't already petrified.
|
|
|
|
|
|
|
| |
We don't use this any more, and instead prefer to always keep
definitions.git petrified, and update the refs ourselves.
branch-from-image still uses some of the remaining petrify code.
|
|\
| |
| |
| |
| |
| | |
'origin/baserock/richardmaw/S11416/no-unnecessary-temp-branches'
Reviewed-by: Daniel Silverstone
|
| | |
|
| | |
|
| | |
|
|/ |
|
|
|
|
|
|
| |
It is entirely possible that we could accidentally give chunks that use
morphologies from the definitions repository, the definitions repository
to build from, rather than the source repository.
|
| |
|
|
|
|
|
|
| |
We don't use this in definitions.git, and we're going to change its
semantics, so the test suite would break until we introduced the new
semantics, unless we remove its use of the old semantics first.
|
|
|
|
|
|
| |
This is required to ensure the right version of morph is used. I have
a .bashrc that causes `morph` to be "$HOME/morph/morph", so it fails to
find morph, because HOME is set to a directory inside DATADIR.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We want to move our morphologies in our definitions repository into
subdirectories, so they're more organised.
We'd prefer to only refer to morphologies by file path, rather than a
name that loosely corresponds to the file path, but we need to support
that for backwards compatibility until we can move all of our
morphologies into the definitions repository.
However, since we want to eventually remove this, and we want to ensure
that file paths work, we change the yarn tests to use file paths.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
`morph merge` only worked for a small subset of cases, and has been left
to bit-rot, since we don't use it.
`morph tag` is just a `git tag` when we have petrified definitions
repository. We don't use it, nor do we need it, so it can go away rather
than take up valuable development time fixing it when requirements
change.
`old-foo` have all been superceded by newer versions and are no-longer
used.
|
|
|
|
|
|
|
| |
This was the wrong response to the problem of accidentally checking-out
morph when trying to check out morphs. Now that it's called definitions,
this is irrelevent, and aborting a checkout when this check fails is the
wrong thing to do.
|
| |
|
|\
| |
| |
| | |
Reviewed-by: Sam Thursfield and Richard Ipsum
|
| | |
|
|/ |
|
|
|
|
| |
Older versions of btrfs fail with just 10M.
|
|
|
|
|
|
|
|
|
| |
This reverts commit f366960273b026322f7e7cc3c1eb0cd632ebc73e.
These changes break building on x86_64, which is our main development
platform.
Better patches will be forthcoming later.
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
| |
|
| |
|
|
|
|
|
| |
These are _directory_ names, not chunk repo URLs, so a slash is correct
now.
|
| |
|