summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFirehose merge bot <firehose@merge.bot>2014-08-07 12:22:30 (GMT)
committerFirehose merge bot <firehose@merge.bot>2014-08-07 12:22:30 (GMT)
commitf61456bca55644b432568f4a57bb01c58243d2de (patch)
treee22e4ff5083dab80746337700b64bce8f18fbf44
parentc2bf2f9961bea6c382fe17bbf1057a58ce6a3d2b (diff)
downloadfirehose-f61456bca55644b432568f4a57bb01c58243d2de.tar.gz
More tweaks, set up for running against internal trove
-rw-r--r--.gitignore1
-rw-r--r--examples/cross-bootstrap-morph.yaml4
-rw-r--r--examples/linux-master.yaml4
-rw-r--r--examples/linux.yaml.disabled4
-rw-r--r--examples/morph.yaml4
-rw-r--r--examples/screen.yaml4
-rw-r--r--examples/vim.yaml4
-rw-r--r--plugin/firehose_plugin.py11
8 files changed, 23 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index 2f836aa..2c5323c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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)
+