10:06 a.m.
repo: git.baserock.org/baserock/baserock/morph
branch: danielfirth/RT219
sha1 :88c72bf91f357e453e7ca23d3890d3412c5bd799
Dan Firth (1):
Changed deployment tests to look in the test morphs directory for
deployment images
Daniel Firth (1):
Morph now executes extensions in the repository containing the
morphologies
morphlib/plugins/deploy_plugin.py | 2 +-
tests.deploy/deploy-cluster.script | 12 ++++++------
tests.deploy/deploy-rawdisk.script | 4 +++-
3 files changed, 10 insertions(+), 8 deletions(-)
--
1.8.1.2
10:06 a.m.
New subject: [PATCH 1/2] Morph now executes extensions in the repository containing the morphologies
---
morphlib/plugins/deploy_plugin.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py
index dc9f515..35bb2b6 100644
--- a/morphlib/plugins/deploy_plugin.py
+++ b/morphlib/plugins/deploy_plugin.py
@@ -461,7 +461,7 @@ class DeployPlugin(cliapp.Plugin):
self.app.runcmd(
[ext_filename] + args,
['sh', '-c', 'while read l; do echo `date "+%F
%T"` $l; done'],
- env=env, stdout=None, stderr=None)
+ cwd=repo_dir, env=env, stdout=None, stderr=None)
if delete_ext:
os.remove(ext_filename)
--
1.8.1.2
10:06 a.m.
New subject: [PATCH 2/2] Changed deployment tests to look in the test morphs directory for deployment images
From: Dan Firth <dan.firth(a)codethink.co.uk>
---
tests.deploy/deploy-cluster.script | 12 ++++++------
tests.deploy/deploy-rawdisk.script | 4 +++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/tests.deploy/deploy-cluster.script b/tests.deploy/deploy-cluster.script
index 917ac71..0efc8d3 100755
--- a/tests.deploy/deploy-cluster.script
+++ b/tests.deploy/deploy-cluster.script
@@ -18,7 +18,6 @@
# Test "morph deploy" by deploying the systems in cluster morphology.
-
set -eu
@@ -35,12 +34,13 @@ cd "$DATADIR/workspace/branch1"
linux-system-2.HOSTNAME="baserock-rocks-even-more" \
/dev/null
-test -e hello-system.img
-test -e linux-system-1.tar
-test -e linux-system-2.tar
+outputdir=test:morphs
+test -e $outputdir/hello-system.img
+test -e $outputdir/linux-system-1.tar
+test -e $outputdir/linux-system-2.tar
-hostname1=$(tar -xf linux-system-1.tar ./etc/hostname -O)
-hostname2=$(tar -xf linux-system-2.tar ./etc/hostname -O)
+hostname1=$(tar -xf $outputdir/linux-system-1.tar ./etc/hostname -O)
+hostname2=$(tar -xf $outputdir/linux-system-2.tar ./etc/hostname -O)
[ "$hostname1" = baserock-rocks ]
[ "$hostname2" = baserock-rocks-even-more ]
diff --git a/tests.deploy/deploy-rawdisk.script b/tests.deploy/deploy-rawdisk.script
index ebda50c..257ef0d 100755
--- a/tests.deploy/deploy-rawdisk.script
+++ b/tests.deploy/deploy-rawdisk.script
@@ -27,5 +27,7 @@ cd "$DATADIR/workspace/branch1"
"$SRCDIR/scripts/test-morph" build linux-system
"$SRCDIR/scripts/test-morph" --log "$DATADIR/deploy.log" \
deploy rawdisk_test_cluster > /dev/null
-test -e disk.img
+
+outputdir="test:morphs"
+test -e $outputdir/disk.img
--
1.8.1.2
10:23 a.m.
On Thu, Sep 26, 2013 at 04:06:32PM +0100, Daniel Firth wrote:
repo: git.baserock.org/baserock/baserock/morph
branch: danielfirth/RT219
sha1 :88c72bf91f357e453e7ca23d3890d3412c5bd799
+1, thank you!
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
3466
days inactive
3466
days old
3 comments
2 participants
participants (2)
-
Daniel Firth -
Lars Wirzenius