--- morphlib/plugins/branch_and_merge_plugin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index fec1641..2679b20 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -1718,8 +1718,9 @@ class BranchAndMergePlugin(cliapp.Plugin): # Obtain parent SHA1 for the temporary ref tree to be committed. # This will either be the current commit of the temporary ref or # HEAD in case the temporary ref does not exist yet. - system_branch_sha1 = self.resolve_ref(repo_dir, system_branch) - parent_sha1 = self.resolve_ref(repo_dir, build_ref) + system_branch_sha1 = self.resolve_ref( + repo_dir, '%s^{commit}' % system_branch) + parent_sha1 = self.resolve_ref(repo_dir, '%s^{commit}' % build_ref) if not parent_sha1: parent_sha1 = system_branch_sha1 -- 1.8.1.2

--- yarns/branches-workspaces.yarn | 12 ++++++------ yarns/implementations.yarn | 24 +++++++++++++++++++++++- yarns/morph.shell-lib | 5 +++++ yarns/regresion.yarn | 14 ++++++++++++++ 4 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 yarns/regresion.yarn diff --git a/yarns/branches-workspaces.yarn b/yarns/branches-workspaces.yarn index cd3f7a0..c015a8f 100644 --- a/yarns/branches-workspaces.yarn +++ b/yarns/branches-workspaces.yarn @@ -47,7 +47,7 @@ Once we have a workspace, we can check out a system branch. SCENARIO check out an existing system branch GIVEN a workspace AND a git server - WHEN checking out the master system branch + WHEN checking out the master system branch/tag THEN the system branch master is checked out Checking out a system branch should fail, if the branch doesn't exist. @@ -104,7 +104,7 @@ a git checkout inside that. SCENARIO morph workspace works in system branch checkouts GIVEN a workspace AND a git server - WHEN checking out the master system branch + WHEN checking out the master system branch/tag AND morph reports workspace in master THEN workspace is reported correctly @@ -130,7 +130,7 @@ current working directory, it will find it and report it correctly. SCENARIO morph reports system branch GIVEN a workspace AND a git server - WHEN checking out the master system branch + WHEN checking out the master system branch/tag AND reporting system branch in master THEN system branch is reported as master @@ -146,7 +146,7 @@ current directory, things should fail. SCENARIO morph fails to report system branch with two checked out GIVEN a workspace AND a git server - WHEN checking out the master system branch + WHEN checking out the master system branch/tag AND creating system branch foo AND attempting to report system branch in . THEN morph failed @@ -158,7 +158,7 @@ somewhere outside a checkout, where exactly one checkout exists below. SCENARIO morph reports system branch root repository GIVEN a workspace AND a git server - WHEN checking out the master system branch + WHEN checking out the master system branch/tag AND reporting system branch root repository in master THEN root repository is reported as test:morphs @@ -303,7 +303,7 @@ These can be checked out like normal system branches. GIVEN a workspace AND a git server AND null refs for local strata - WHEN checking out the master system branch + WHEN checking out the master system branch/tag THEN the system branch master is checked out Likewise we can also create new system branches from these, and we diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index 6e1fae1..b9af649 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -76,6 +76,13 @@ another to hold a chunk. morph: test-stratum EOF + cat << EOF > "$DATADIR/gits/morphs/simple-system.morph" + name: simple-system + kind: system + arch: $arch + strata: [] + EOF + cat << EOF > "$DATADIR/gits/morphs/test-stratum.morph" name: test-stratum kind: stratum @@ -91,6 +98,7 @@ another to hold a chunk. run_in "$DATADIR/gits/morphs" git init . run_in "$DATADIR/gits/morphs" git add . run_in "$DATADIR/gits/morphs" git commit -m Initial. + run_in "$DATADIR/gits/morphs" git tag -a "test-tag" -m "Tagging test-tag" # Create the chunk repository. @@ -112,8 +120,14 @@ another to hold a chunk. cat << EOF > "$DATADIR/morph.conf" [config] repo-alias = test=file://$DATADIR/gits/%s#file://$DATADIR/gits/%s + cachedir = $DATADIR/cache + tempdir = $DATADIR/tmp + trove-host= [] EOF + mkdir "$DATADIR/cache" + mkdir "$DATADIR/tmp" + Morphologies need to support having a null ref, which means look for the stratum in the same repository and ref. Testing this requires different morphologies. @@ -132,7 +146,7 @@ Implementation sections for system branch operations Checkout out an existing system branch. We parameterise this so the same phrase can be used to check out any system branch. - IMPLEMENTS WHEN checking out the (\S+) system branch + IMPLEMENTS WHEN checking out the (\S+) system branch/tag cd "$DATADIR/workspace" run_morph checkout test:morphs "$MATCH_1" @@ -419,3 +433,11 @@ Generating a manifest. if ! grep -q hello_world "$DATADIR/manifest"; then die "Output isn't what we expect" fi + + +Implementations for building systems +------------------------------------ + + IMPLEMENTS THEN morph build the system (\S+) of the branch/tag (\S+) of the repo (\S+) + cd "$DATADIR/workspace/$MATCH_2/$MATCH_3" + run_morph build "$MATCH_1" diff --git a/yarns/morph.shell-lib b/yarns/morph.shell-lib index 448c60c..68c4381 100644 --- a/yarns/morph.shell-lib +++ b/yarns/morph.shell-lib @@ -34,6 +34,11 @@ run_morph() --no-default-config --config "$DATADIR/morph.conf" "$@" } +run_morph2() +{ + "${SRCDIR:-.}"/morph \ + --no-default-config --config "$DATADIR/morph.conf" "$@" > /root/FILEOUT +} # Sometimes we want to try running morph, but are OK if it fails, we just # need to remember that it did. diff --git a/yarns/regresion.yarn b/yarns/regresion.yarn new file mode 100644 index 0000000..90bb52c --- /dev/null +++ b/yarns/regresion.yarn @@ -0,0 +1,14 @@ +"regression" tests +================================ + +Tests for check we don't introduce some bugs again. + + +Testing if we can build after checking out from a tag. + + SCENARIO morph build works after checkout from a tag + GIVEN a workspace + AND a git server + WHEN checking out the test-tag system branch/tag + THEN morph build the system simple-system of the branch/tag test-tag of the repo test:morphs + -- 1.7.10.4

--- yarns/branches-workspaces.yarn | 12 ++++++------ yarns/implementations.yarn | 23 ++++++++++++++++++++++- yarns/regression.yarn | 14 ++++++++++++++ 3 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 yarns/regression.yarn diff --git a/yarns/branches-workspaces.yarn b/yarns/branches-workspaces.yarn index cd3f7a0..c015a8f 100644 --- a/yarns/branches-workspaces.yarn +++ b/yarns/branches-workspaces.yarn @@ -47,7 +47,7 @@ Once we have a workspace, we can check out a system branch. SCENARIO check out an existing system branch GIVEN a workspace AND a git server - WHEN checking out the master system branch + WHEN checking out the master system branch/tag THEN the system branch master is checked out Checking out a system branch should fail, if the branch doesn't exist. @@ -104,7 +104,7 @@ a git checkout inside that. SCENARIO morph workspace works in system branch checkouts GIVEN a workspace AND a git server - WHEN checking out the master system branch + WHEN checking out the master system branch/tag AND morph reports workspace in master THEN workspace is reported correctly @@ -130,7 +130,7 @@ current working directory, it will find it and report it correctly. SCENARIO morph reports system branch GIVEN a workspace AND a git server - WHEN checking out the master system branch + WHEN checking out the master system branch/tag AND reporting system branch in master THEN system branch is reported as master @@ -146,7 +146,7 @@ current directory, things should fail. SCENARIO morph fails to report system branch with two checked out GIVEN a workspace AND a git server - WHEN checking out the master system branch + WHEN checking out the master system branch/tag AND creating system branch foo AND attempting to report system branch in . THEN morph failed @@ -158,7 +158,7 @@ somewhere outside a checkout, where exactly one checkout exists below. SCENARIO morph reports system branch root repository GIVEN a workspace AND a git server - WHEN checking out the master system branch + WHEN checking out the master system branch/tag AND reporting system branch root repository in master THEN root repository is reported as test:morphs @@ -303,7 +303,7 @@ These can be checked out like normal system branches. GIVEN a workspace AND a git server AND null refs for local strata - WHEN checking out the master system branch + WHEN checking out the master system branch/tag THEN the system branch master is checked out Likewise we can also create new system branches from these, and we diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index 3d403f3..21ea153 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -76,6 +76,13 @@ another to hold a chunk. morph: test-stratum EOF + cat << EOF > "$DATADIR/gits/morphs/simple-system.morph" + name: simple-system + kind: system + arch: $arch + strata: [] + EOF + cat << EOF > "$DATADIR/gits/morphs/test-stratum.morph" name: test-stratum kind: stratum @@ -91,6 +98,7 @@ another to hold a chunk. run_in "$DATADIR/gits/morphs" git init . run_in "$DATADIR/gits/morphs" git add . run_in "$DATADIR/gits/morphs" git commit -m Initial. + run_in "$DATADIR/gits/morphs" git tag -a "test-tag" -m "Tagging test-tag" # Create the chunk repository. @@ -112,8 +120,14 @@ another to hold a chunk. cat << EOF > "$DATADIR/morph.conf" [config] repo-alias = test=file://$DATADIR/gits/%s#file://$DATADIR/gits/%s + cachedir = $DATADIR/cache + tempdir = $DATADIR/tmp + trove-host= [] EOF + mkdir "$DATADIR/cache" + mkdir "$DATADIR/tmp" + Morphologies need to support having a null ref, which means look for the stratum in the same repository and ref. Testing this requires different morphologies. @@ -132,7 +146,7 @@ Implementation sections for system branch operations Checkout out an existing system branch. We parameterise this so the same phrase can be used to check out any system branch. - IMPLEMENTS WHEN checking out the (\S+) system branch + IMPLEMENTS WHEN checking out the (\S+) system branch/tag cd "$DATADIR/workspace" run_morph checkout test:morphs "$MATCH_1" @@ -496,3 +510,10 @@ variables in `$DATADIR/env`. We treat the value as a format string for IMPLEMENTS GIVEN an environment variable (\S+) containing "(.*)" printf "export $MATCH_1=$MATCH_2" >> "$DATADIR/env" + +Implementations for building systems +------------------------------------ + + IMPLEMENTS THEN morph build the system (\S+) of the branch/tag (\S+) of the repo (\S+) + cd "$DATADIR/workspace/$MATCH_2/$MATCH_3" + run_morph build "$MATCH_1" diff --git a/yarns/regression.yarn b/yarns/regression.yarn new file mode 100644 index 0000000..90bb52c --- /dev/null +++ b/yarns/regression.yarn @@ -0,0 +1,14 @@ +"regression" tests +================================ + +Tests for check we don't introduce some bugs again. + + +Testing if we can build after checking out from a tag. + + SCENARIO morph build works after checkout from a tag + GIVEN a workspace + AND a git server + WHEN checking out the test-tag system branch/tag + THEN morph build the system simple-system of the branch/tag test-tag of the repo test:morphs + -- 1.7.10.4

On Fri, Oct 25, 2013 at 03:50:20PM +0100, Richard Maw wrote: I would make it clear whether we're building from a tag or not, in the step name. As you point out this is easy to do, with a regexp. -1 from me until this is done. Otherwise, looks good. -- http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/

From: Daniel Firth <dan.firth(a)codethink.co.uk&gt; --- morphlib/plugins/branch_and_merge_plugin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 9961fcf..260c0e4 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -1718,8 +1718,9 @@ class BranchAndMergePlugin(cliapp.Plugin): # Obtain parent SHA1 for the temporary ref tree to be committed. # This will either be the current commit of the temporary ref or # HEAD in case the temporary ref does not exist yet. - system_branch_sha1 = self.resolve_ref(repo_dir, system_branch) - parent_sha1 = self.resolve_ref(repo_dir, build_ref) + system_branch_sha1 = self.resolve_ref( + repo_dir, '%s^{commit}' % system_branch) + parent_sha1 = self.resolve_ref(repo_dir, '%s^{commit}' % build_ref) if not parent_sha1: parent_sha1 = system_branch_sha1 -- 1.7.10.4