unsubscribe at the start of the test as well, if nodes are not freshly reimaged

then they may have subscription from old configuration

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>

diff --git a/teuthology/task/internal/redhat.py b/teuthology/task/internal/redhat.py
index c306ce2001e24c5a71470a46d32c9eb04e861718..878d26b591c6e8193eac54c3c21cfda425fa1d8c 100644 (file)
--- a/teuthology/task/internal/redhat.py
+++ b/teuthology/task/internal/redhat.py
@@ -33,6 +33,7 @@ def setup_stage_cdn(ctx, config):
 
 
 def _subscribe_stage_cdn(remote, teuthconfig):
+    _unsubscribe_stage_cdn(remote)
     cdn_config = teuthconfig.get('cdn-config', dict())
     server_url = cdn_config.get('server-url', 'subscription.rhsm.stage.redhat.com:443/subscription')
     base_url = cdn_config.get('base-url', 'https://cdn.stage.redhat.com')
@@ -53,7 +54,7 @@ def _subscribe_stage_cdn(remote, teuthconfig):
 
 def _unsubscribe_stage_cdn(remote):
     remote.run(args=['sudo', 'subscription-manager', 'unregister'],
-        check_status=False)
+               check_status=False)
 
 
 @contextlib.contextmanager