diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-06 17:06:38 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-12 16:48:18 +0000 |
| commit | cbaa45c1dccec5bc5e7fd1650a6a2f99638ee65e (patch) | |
| tree | e7e89af59724bdc346861d8b764789e891dbe5bd /tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script | |
| parent | a49db7757e2d2902989dc0601eda93557d1ee55c (diff) | |
| download | morph-cbaa45c1dccec5bc5e7fd1650a6a2f99638ee65e.tar.gz | |
morph build: Use the user's own repos when building
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.
Diffstat (limited to 'tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script')
| -rwxr-xr-x | tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script index f959bb43..642093dc 100755 --- a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script +++ b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script @@ -34,14 +34,10 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" build linux-system # Print tree SHA1s of the build ref of morphs and kernel. -echo "Tree of morphs repo build branch after first build:" cd "$DATADIR/workspace/branch1/test:morphs" -git log -1 --format=%T baserock/builds/123456789/987654321 -echo "Tree of kernel repo build branch after first build:" +MORPHS_SHA1="$(git rev-parse baserock/builds/123456789/987654321)" cd "$DATADIR/workspace/branch1/test:kernel-repo" -git log -1 --format=%T baserock/builds/123456789/AABBCCDDE - -echo +KERNEL_SHA1="$(git rev-parse baserock/builds/123456789/AABBCCDDE)" # Make an uncommitted change to the linux morphology. cd "$DATADIR/workspace/branch1/test:kernel-repo" @@ -55,9 +51,7 @@ cd "$DATADIR/workspace" # This time the tree SHA1 of morphs should be the same # but that of the kernel repo should be different because we # made a change. -echo "Tree of morphs repo build branch after second build:" cd "$DATADIR/workspace/branch1/test:morphs" -git log -1 --format=%T baserock/builds/123456789/987654321 -echo "Tree of kernel repo build branch after second build:" +[ "$(git rev-parse baserock/builds/123456789/987654321)" != "$MORPHS_SHA1" ] cd "$DATADIR/workspace/branch1/test:kernel-repo" -git log -1 --format=%T baserock/builds/123456789/AABBCCDDE +[ "$(git rev-parse baserock/builds/123456789/AABBCCDDE)" != "$KERNEL_SHA1" ] |