diff options
-rw-r--r-- | examples/cpython.yaml | 3 | ||||
-rw-r--r-- | examples/cross-bootstrap-morph.yaml | 4 | ||||
-rw-r--r-- | examples/linux-master.yaml | 2 | ||||
-rw-r--r-- | examples/linux.yaml.disabled | 2 | ||||
-rw-r--r-- | examples/morph.yaml | 4 | ||||
-rw-r--r-- | examples/screen.yaml | 4 | ||||
-rw-r--r-- | examples/vim.yaml | 3 | ||||
-rw-r--r-- | firehose/plugin/firehose_plugin.py | 10 |
8 files changed, 12 insertions, 20 deletions
diff --git a/examples/cpython.yaml b/examples/cpython.yaml index 6f8c5f8..efe0786 100644 --- a/examples/cpython.yaml +++ b/examples/cpython.yaml @@ -7,7 +7,7 @@ description: | landing: repo: baserock:baserock/definitions baseref: master - myref: ct-mcr-1/danielsilverstone/firehose-test-1 + destref: ct-mcr-1/danielsilverstone/firehose-test-1 stratum: core chunk: cpython method: absolute-sha1 @@ -15,4 +15,3 @@ landing: tracking: mode: follow-tip ref: refs/heads/2.7 - diff --git a/examples/cross-bootstrap-morph.yaml b/examples/cross-bootstrap-morph.yaml index 64ff00b..0763a78 100644 --- a/examples/cross-bootstrap-morph.yaml +++ b/examples/cross-bootstrap-morph.yaml @@ -10,7 +10,7 @@ description: | landing: repo: baserock:baserock/definitions baseref: master - myref: ct-mcr-1/danielsilverstone/firehose-test-1 + destref: ct-mcr-1/danielsilverstone/firehose-test-1 stratum: cross-bootstrap chunk: morph method: absolute-sha1 @@ -18,5 +18,3 @@ landing: tracking: mode: follow-tip ref: refs/heads/master - - diff --git a/examples/linux-master.yaml b/examples/linux-master.yaml index c2b1af4..9387366 100644 --- a/examples/linux-master.yaml +++ b/examples/linux-master.yaml @@ -7,7 +7,7 @@ description: | landing: repo: baserock:baserock/definitions baseref: master - myref: ct-mcr-1/danielsilverstone/firehose-test-1 + destref: 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 0230bcd..001fba4 100644 --- a/examples/linux.yaml.disabled +++ b/examples/linux.yaml.disabled @@ -8,7 +8,7 @@ description: | landing: repo: baserock:baserock/definitions baseref: ct-mcr-1/danielsilverstone/firehose-test-baseline - myref: ct-mcr-1/danielsilverstone/firehose-test-1 + destref: 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 d0c6529..955cc6d 100644 --- a/examples/morph.yaml +++ b/examples/morph.yaml @@ -7,7 +7,7 @@ description: | landing: repo: baserock:baserock/definitions baseref: master - myref: ct-mcr-1/danielsilverstone/firehose-test-1 + destref: ct-mcr-1/danielsilverstone/firehose-test-1 stratum: tools chunk: morph method: absolute-sha1 @@ -15,5 +15,3 @@ landing: tracking: mode: follow-tip ref: refs/heads/master - - diff --git a/examples/screen.yaml b/examples/screen.yaml index 315da3e..966881d 100644 --- a/examples/screen.yaml +++ b/examples/screen.yaml @@ -7,7 +7,7 @@ description: | landing: repo: baserock:baserock/definitions baseref: master - myref: ct-mcr-1/danielsilverstone/firehose-test-1 + destref: ct-mcr-1/danielsilverstone/firehose-test-1 stratum: tools chunk: screen method: absolute-sha1 @@ -15,5 +15,3 @@ landing: tracking: mode: follow-tip ref: refs/heads/master - - diff --git a/examples/vim.yaml b/examples/vim.yaml index d02c13d..f067d47 100644 --- a/examples/vim.yaml +++ b/examples/vim.yaml @@ -8,7 +8,7 @@ description: | landing: repo: baserock:baserock/definitions baseref: master - myref: ct-mcr-1/danielsilverstone/firehose-test-1 + destref: ct-mcr-1/danielsilverstone/firehose-test-1 stratum: tools chunk: vim method: absolute-sha1 @@ -21,4 +21,3 @@ tracking: transforms: - match: v([0-9]-[0-9])([^-].*) replacement: \1~\2 - diff --git a/firehose/plugin/firehose_plugin.py b/firehose/plugin/firehose_plugin.py index 15b5844..09406aa 100644 --- a/firehose/plugin/firehose_plugin.py +++ b/firehose/plugin/firehose_plugin.py @@ -73,8 +73,8 @@ class FirehosePlugin(cliapp.Plugin): raise cliapp.AppException("Not all firehoses have the same landing repo") if len(set(c.landing_baseref for c in confs)) > 1: raise cliapp.AppException("Not all firehoses have the same landing baseref") - if len(set(c.landing_myref for c in confs)) > 1: - raise cliapp.AppException("Not all firehoses have the same landing myref") + if len(set(c.landing_destref for c in confs)) > 1: + raise cliapp.AppException("Not all firehoses have the same landing destref") # Ensure that all incoming configurations have unique things they are @@ -109,14 +109,14 @@ class FirehosePlugin(cliapp.Plugin): def make_branch(self, root): os.chdir(self.make_path("ws")) try: - self.app.subcommands['branch']([root['repo'], root['myref'], root['baseref']]) + self.app.subcommands['branch']([root['repo'], root['destref'], root['baseref']]) except cliapp.AppException, ae: if "already exists in" in str(ae): - self.app.subcommands['checkout']([root['repo'], root['myref']]) + self.app.subcommands['checkout']([root['repo'], root['destref']]) else: raise repopath = root['repo'].replace(':', '/') - self.gitpath = self.make_path("ws", root['myref'], repopath) + self.gitpath = self.make_path("ws", root['destref'], repopath) def log_sha(self, name): sha = self.app.runcmd(['git', 'rev-parse', 'HEAD'], cwd=self.gitpath).strip() |