diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-14 17:08:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-14 17:08:07 +0000 |
| commit | 0e1942e8ea16d1648955d3d9c27461457c1d2834 (patch) | |
| tree | ec51498b5999ec20b1cd5a740a2c473a5c1c4f01 | |
| parent | faa9891d6c9e6eb98c2a3e748d77cf14f0e65a0e (diff) | |
| parent | 0b76f2f0d2da2afb4df2a9c54c8a362621373d7c (diff) | |
| download | tempest-0e1942e8ea16d1648955d3d9c27461457c1d2834.tar.gz | |
Merge "Run telemetry in javelin if resources.yaml says so"
| -rwxr-xr-x | tempest/cmd/javelin.py | 2 | ||||
| -rw-r--r-- | tempest/cmd/resources.yaml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tempest/cmd/javelin.py b/tempest/cmd/javelin.py index 4e6d04ab1..0adc7e0ee 100755 --- a/tempest/cmd/javelin.py +++ b/tempest/cmd/javelin.py @@ -283,6 +283,8 @@ class JavelinCheck(unittest.TestCase): If in check mode confirm that the oldest sample available is from before the upgrade. """ + if not self.res.get('telemetry'): + return LOG.info("checking telemetry") for server in self.res['servers']: client = client_for_user(server['owner']) diff --git a/tempest/cmd/resources.yaml b/tempest/cmd/resources.yaml index 19ee6d595..2d5e68687 100644 --- a/tempest/cmd/resources.yaml +++ b/tempest/cmd/resources.yaml @@ -57,3 +57,4 @@ objects: name: javelin1 owner: javelin file: /etc/hosts +telemetry: true |