Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/fix-snapcraft-staging into lp:snappy-ecosystem-tests

[Omer Akram]

Fix snapcraft staging

Fix snapcraft staging, apparently we were pointing to production url

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:43
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/280/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2109/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/280/rebuild

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:44
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/281/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2110/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/281/rebuild

review: Approve (continuous-integration)

[I Ahmad (iahmad)]

LGTM

review: Approve

[platform-qa-bot (platform-qa-bot)]

FAILED: Autolanding.
Unapproved changes made after approval.
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-autoland/111/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-land-mp/2807/console

review: Needs Fixing (continuous-integration)

[Omer Akram (om26er)]

re-approving.

review: Approve

[platform-qa-bot (platform-qa-bot)]

review: Approve (continuous-integration)

=== modified file 'snappy_ecosystem_tests/environment/constants.py'
--- snappy_ecosystem_tests/environment/constants.py	2017-03-08 17:29:20 +0000
+++ snappy_ecosystem_tests/environment/constants.py	2017-03-10 10:28:30 +0000
@@ -50,13 +50,13 @@
             "package_name": 'snapcraft',
             "environment_variables": {
                 "UBUNTU_STORE_API_ROOT_URL":
-                    "https://myapps.developer.ubuntu.com/dev/api/",
+                    "https://myapps.developer.staging.ubuntu.com/dev/api/",
                 "UBUNTU_STORE_UPLOAD_ROOT_URL":
-                    "https://upload.apps.ubuntu.com",
+                    "https://upload.apps.staging.ubuntu.com/",
                 "UBUNTU_SSO_API_ROOT_URL":
-                    "https://login.ubuntu.com/api/v2/",
+                    "https://login.staging.ubuntu.com/api/v2/",
                 "UBUNTU_STORE_SEARCH_ROOT_URL":
-                    "https://search.apps.ubuntu.com/"
+                    "https://search.apps.staging.ubuntu.com/"
             }
         },
         "snapweb": {

=== modified file 'snappy_ecosystem_tests/environment/setup.py'
--- snappy_ecosystem_tests/environment/setup.py	2017-03-09 08:13:37 +0000
+++ snappy_ecosystem_tests/environment/setup.py	2017-03-10 10:28:30 +0000
@@ -51,8 +51,7 @@
 if __name__ == '__main__':
     PARSER = argparse.ArgumentParser(description=
                                      'Setup a snappy ecosystem environment.')
-    PARSER.add_argument('--mode', default="lxd",
-                        help='lxd')
+    PARSER.add_argument('--mode', default="lxd", help='lxd')
     PARSER.add_argument('--profile', default="staging",
                         help='Profile to configure the environment')
     ARGS = PARSER.parse_args()

=== modified file 'snappy_ecosystem_tests/helpers/snapcraft/client.py'
--- snappy_ecosystem_tests/helpers/snapcraft/client.py	2017-03-08 17:59:46 +0000
+++ snappy_ecosystem_tests/helpers/snapcraft/client.py	2017-03-10 10:28:30 +0000
@@ -24,16 +24,14 @@
 import subprocess
 import time
 
+from snappy_ecosystem_tests.environment.constants import PROFILES, SNAPCRAFT
 from snappy_ecosystem_tests.models.snap import Snap
 from snappy_ecosystem_tests.utils.commands import build_command
 from snappy_ecosystem_tests.utils.filters import filter_list
 from snappy_ecosystem_tests.utils.ssh import SSHManager
 from snappy_ecosystem_tests.utils.storeconfig import get_current_store
-
 from snappy_ecosystem_tests.commons.config import CONFIG_STACK
-
 from snappy_ecosystem_tests.utils import storeconfig
-
 # login credentials gotten from config file or shell environment
 from snappy_ecosystem_tests.utils.user import (
     get_snapcraft_remote_host_credentials
@@ -64,7 +62,7 @@
 SNAPCRAFT_CONFIG_FILE_PATH = '~/.config/snapcraft/snapcraft.cfg'
 
 
-class Snapcraft(object):
+class Snapcraft:
     """Contain Snapcraft specific functionality to use via command
     line interface"""
     def __init__(self):
@@ -90,7 +88,10 @@
             command = build_snapcraft_command(command)
         if debug:
             command += ' -d'
-        return self.ssh.exec_command(command)
+        return self.ssh.exec_command(
+            command,
+            environment=PROFILES[get_current_store()][SNAPCRAFT]
+            ["environment_variables"])
 
     def assert_logged_in(self):
         """Assert that an user is logged.
@@ -104,7 +105,9 @@
         """Return bool representing if the user is logged into snapcraft."""
         try:
             output = self.ssh.exec_command(
-                'cat %s' % SNAPCRAFT_CONFIG_FILE_PATH)
+                'cat %s' % SNAPCRAFT_CONFIG_FILE_PATH,
+                environment=PROFILES[get_current_store()][SNAPCRAFT]
+                ["environment_variables"])
             return output is not ''
         except ValueError:
             return False
@@ -126,9 +129,11 @@
         :param email: the SSO email
         :param password: the email password
         """
-        self.ssh.exec_command((
+        self.ssh.exec_command(
             COMMANDS_LOGIN.format(email=email, password=password,
-                                  snapcraft=PATH_SNAPCRAFT)))
+                                  snapcraft=PATH_SNAPCRAFT),
+            environment=PROFILES[get_current_store()][SNAPCRAFT]
+            ["environment_variables"])
         return self.is_logged_in()
 
     def list_registered(self, debug=True, raw=False):

=== modified file 'snappy_ecosystem_tests/helpers/store_apis/rest_apis.py'
--- snappy_ecosystem_tests/helpers/store_apis/rest_apis.py	2017-03-08 17:29:20 +0000
+++ snappy_ecosystem_tests/helpers/store_apis/rest_apis.py	2017-03-10 10:28:30 +0000
@@ -619,8 +619,7 @@
         :param series: the snap's series to be registered
         """
         auth = _macaroon_auth(self.conf)
-        data = dict(snap_name=snap_name, is_private=private,
-                    series=series)
+        data = dict(snap_name=snap_name, is_private=private, series=series)
         response = self.post(
             'register-name/', data=json.dumps(data),
             headers=dict({'Authorization': auth}, **JSON_CONTENT_TYPE))