tanuki-agent

Merge lp:~noise/tanuki-agent/e2e-local into lp:tanuki-agent

  1. e2e-local
  2. Merge into trunk
Proposed by Bret Barker
Status: Merged
Approved by: Roberto Alsina
Approved revision: 84
Merged at revision: 86
Proposed branch: lp:~noise/tanuki-agent/e2e-local
Merge into: lp:tanuki-agent
Diff against target: 37 lines (+7/-5)
1 file modified
scripts/e2e.py (+7/-5)
To merge this branch: bzr merge lp:~noise/tanuki-agent/e2e-local
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+271345@code.launchpad.net

Commit message

allow overrides for specmgr_server and results_server to test locally

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/e2e.py'
2--- scripts/e2e.py 2015-08-28 13:50:20 +0000
3+++ scripts/e2e.py 2015-09-16 16:43:36 +0000
4@@ -84,6 +84,8 @@
5 self.platform = self.config.get('config', 'platform')
6 self.interval = self.config.getfloat('config', 'interval')
7 self.server = self.config.get('config', 'server')
8+ self.specmgr_server = self.config.get('config', 'specmgr_server', fallback=self.server)
9+ self.results_server = self.config.get('config', 'results_server', fallback=self.server)
10 self.image_name = self.config.get('config', 'image_name')
11 self.test_payload = self.config.get('config', 'test_payload')
12 self.timeout = self.config.getint('config', 'network_timeout')
13@@ -99,19 +101,19 @@
14 self.config.get('config', 'image_unique_id'), rand_token)
15
16 self.manifest_url = urllib.parse.urljoin(
17- self.server,
18+ self.specmgr_server,
19 '/'.join(['orgs', self.organization_id, 'products/manifests']))
20 self.spec_url = urllib.parse.urljoin(
21- self.server,
22+ self.specmgr_server,
23 '/'.join(['orgs', self.organization_id, 'tests/specs']))
24 self.image_url = urllib.parse.urljoin(
25- self.server,
26+ self.specmgr_server,
27 '/'.join(['orgs', self.organization_id, 'images']))
28 self.snap_revision_url = urllib.parse.urljoin(
29- self.server,
30+ self.specmgr_server,
31 '/'.join(['orgs', self.organization_id, 'snap-revisions']))
32 self.results_url = urllib.parse.urljoin(
33- self.server,
34+ self.results_server,
35 '/'.join(['orgs', self.organization_id, 'results']))
36
37 if not os.path.isfile(self.confpath):

Subscribers

People subscribed via source and target branches

to all changes: