diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | examples/cross-bootstrap-morph.yaml | 4 | ||||
| -rw-r--r-- | examples/linux-master.yaml | 4 | ||||
| -rw-r--r-- | examples/linux.yaml.disabled | 4 | ||||
| -rw-r--r-- | examples/morph.yaml | 4 | ||||
| -rw-r--r-- | examples/screen.yaml | 4 | ||||
| -rw-r--r-- | examples/vim.yaml | 4 | ||||
| -rw-r--r-- | plugin/firehose_plugin.py | 11 |
8 files changed, 23 insertions, 13 deletions
@@ -1,2 +1,3 @@ *~ *.pyc +*.log diff --git a/examples/cross-bootstrap-morph.yaml b/examples/cross-bootstrap-morph.yaml index 7d112bd..ddb0232 100644 --- a/examples/cross-bootstrap-morph.yaml +++ b/examples/cross-bootstrap-morph.yaml @@ -9,8 +9,8 @@ description: | landing: repo: baserock:baserock/definitions - baseref: master - myref: baserock/firehose + baseref: ct-mcr-1/danielsilverstone/firehose-test-baseline + myref: ct-mcr-1/danielsilverstone/firehose-test-1 stratum: cross-bootstrap chunk: morph method: absolute-sha1 diff --git a/examples/linux-master.yaml b/examples/linux-master.yaml index 81cf151..06ec94a 100644 --- a/examples/linux-master.yaml +++ b/examples/linux-master.yaml @@ -6,8 +6,8 @@ description: | landing: repo: baserock:baserock/definitions - baseref: master - myref: baserock/firehose + baseref: ct-mcr-1/danielsilverstone/firehose-test-baseline + myref: ct-mcr-1/danielsilverstone/firehose-test-1 stratum: bsp-x86_64-generic chunk: linux-x86-64-generic method: absolute-sha1 diff --git a/examples/linux.yaml.disabled b/examples/linux.yaml.disabled index fa9c5f3..0230bcd 100644 --- a/examples/linux.yaml.disabled +++ b/examples/linux.yaml.disabled @@ -7,8 +7,8 @@ description: | landing: repo: baserock:baserock/definitions - baseref: master - myref: baserock/firehose + baseref: ct-mcr-1/danielsilverstone/firehose-test-baseline + myref: ct-mcr-1/danielsilverstone/firehose-test-1 stratum: bsp-x86_64-generic chunk: linux-x86-64-generic method: absolute-sha1 diff --git a/examples/morph.yaml b/examples/morph.yaml index d43ba89..94de1d0 100644 --- a/examples/morph.yaml +++ b/examples/morph.yaml @@ -6,8 +6,8 @@ description: | landing: repo: baserock:baserock/definitions - baseref: master - myref: baserock/firehose + baseref: ct-mcr-1/danielsilverstone/firehose-test-baseline + myref: ct-mcr-1/danielsilverstone/firehose-test-1 stratum: tools chunk: morph method: absolute-sha1 diff --git a/examples/screen.yaml b/examples/screen.yaml index f49baeb..4f2e11a 100644 --- a/examples/screen.yaml +++ b/examples/screen.yaml @@ -6,8 +6,8 @@ description: | landing: repo: baserock:baserock/definitions - baseref: master - myref: baserock/firehose + baseref: ct-mcr-1/danielsilverstone/firehose-test-baseline + myref: ct-mcr-1/danielsilverstone/firehose-test-1 stratum: tools chunk: screen method: absolute-sha1 diff --git a/examples/vim.yaml b/examples/vim.yaml index 5f71731..6d46b87 100644 --- a/examples/vim.yaml +++ b/examples/vim.yaml @@ -7,8 +7,8 @@ description: | landing: repo: baserock:baserock/definitions - baseref: master - myref: baserock/firehose + baseref: ct-mcr-1/danielsilverstone/firehose-test-baseline + myref: ct-mcr-1/danielsilverstone/firehose-test-1 stratum: tools chunk: vim method: absolute-sha1 diff --git a/plugin/firehose_plugin.py b/plugin/firehose_plugin.py index 6f9cc12..25e2eb4 100644 --- a/plugin/firehose_plugin.py +++ b/plugin/firehose_plugin.py @@ -86,7 +86,7 @@ class FirehosePlugin(cliapp.Plugin): for c in confs: self.update_for_conf(c) if self.updated_morphologies(): - print self.app.runcmd_unchecked(["git", "diff"], cwd=self.gitpath)[1] + self.commit_and_push() def make_path(self, *subpath): return os.path.join(self.base_path, *subpath) @@ -229,3 +229,12 @@ class FirehosePlugin(cliapp.Plugin): morph.dirty = False return True + + def commit_and_push(self): + (code, out, err) = self.app.runcmd_unchecked( + ['git', 'commit', '-a', '-m', 'Firehose test commit'], + cwd=self.gitpath) + if code == 0: + self.app.runcmd(['git', 'push', 'origin', 'HEAD'], + cwd=self.gitpath) + |