diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-07-23 17:48:03 +0100 |
---|---|---|
committer | Baserock Gerrit <gerrit@baserock.org> | 2015-09-18 15:50:19 +0000 |
commit | 81ebe71089d802061c2c3cb03bfd548388d04cb8 (patch) | |
tree | 207ec00ee9ca045825dc52560d6ab6ee36e81e7b /tests.branching | |
parent | a4d8098b229592db40565747b0444b518bf8a6eb (diff) | |
download | morph-81ebe71089d802061c2c3cb03bfd548388d04cb8.tar.gz |
Remove support for Baserock definitions format versions 3, 4 and 5
Change-Id: Iad95af65bd5c528d2e72f5b2ffa80a01152f50ff
Diffstat (limited to 'tests.branching')
-rwxr-xr-x | tests.branching/add-then-edit.script | 1 | ||||
-rw-r--r-- | tests.branching/edit-checkouts-existing-chunk.stdout | 2 | ||||
-rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 5 | ||||
-rwxr-xr-x | tests.branching/setup | 9 | ||||
-rwxr-xr-x | tests.branching/setup-second-chunk | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/tests.branching/add-then-edit.script b/tests.branching/add-then-edit.script index bd1094e5..92457cf8 100755 --- a/tests.branching/add-then-edit.script +++ b/tests.branching/add-then-edit.script @@ -33,6 +33,7 @@ with open("hello-stratum.morph", "r") as f: stratum = yaml.load(f) stratum["chunks"].append({ "build-depends": [], + "build-system": "manual", "name": "goodbye", "ref": "master", "repo": "test:goodbye", diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout index f6ac79c2..a859587b 100644 --- a/tests.branching/edit-checkouts-existing-chunk.stdout +++ b/tests.branching/edit-checkouts-existing-chunk.stdout @@ -8,4 +8,4 @@ test:morphs Files in hello: -hello.morph +dummy diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index ee9510b5..2372745e 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -1,8 +1,8 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index f335879..7bf9d37 100644 +index 159854f..0036ee3 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -3,6 +3,7 @@ kind: stratum +@@ -3,7 +3,8 @@ kind: stratum chunks: - name: hello repo: test:hello @@ -11,3 +11,4 @@ index f335879..7bf9d37 100644 + unpetrify-ref: master build-depends: [] build-mode: bootstrap + build-system: manual diff --git a/tests.branching/setup b/tests.branching/setup index 50a95e22..497e9cff 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -64,8 +64,10 @@ chunks: ref: master build-depends: [] build-mode: bootstrap + build-system: manual EOF + scripts/run-git-in "$DATADIR/morphs" init scripts/run-git-in "$DATADIR/morphs" add . scripts/run-git-in "$DATADIR/morphs" commit -m initial @@ -78,15 +80,10 @@ scripts/run-git-in "$DATADIR/morphs" add this.is.alfred scripts/run-git-in "$DATADIR/morphs" commit --quiet -m 'mark as alfred' scripts/run-git-in "$DATADIR/morphs" checkout master - # Create a dummy chunk repository mkdir "$DATADIR/hello" -cat <<EOF > "$DATADIR/hello/hello.morph" -name: hello -kind: chunk -build-system: dummy -EOF +echo 'Chunk repo is empty' > "$DATADIR"/hello/dummy scripts/run-git-in "$DATADIR/hello" init scripts/run-git-in "$DATADIR/hello" add . diff --git a/tests.branching/setup-second-chunk b/tests.branching/setup-second-chunk index c8baa946..ca6882e8 100755 --- a/tests.branching/setup-second-chunk +++ b/tests.branching/setup-second-chunk @@ -49,11 +49,13 @@ chunks: ref: master build-depends: [] build-mode: bootstrap + build-system: manual - name: goodbye repo: test:goodbye ref: master build-depends: [] build-mode: bootstrap + build-system: manual EOF git commit -q --all -m "Add goodbye to hello-stratum" |