Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/fixing-proxy-issue-containers into lp:snappy-ecosystem-tests

[Heber Parrucci]

Fixing proxy in container for jenkins

Fixing proxy in container for jenkins

[Santiago Baldassin (sbaldassin)]

Looks great!

review: Approve

[Omer Akram (om26er)]

a comment inline

[Omer Akram (om26er)]

another comment

[lp:~canonical-platform-qa/snappy-ecosystem-tests/fixing-proxy-issue-containers]

57. By Heber Parrucci on 2017-03-16

changes http key for http_proxy

[Heber Parrucci (heber013)]

reply inline

[lp:~canonical-platform-qa/snappy-ecosystem-tests/fixing-proxy-issue-containers]

58. By Heber Parrucci on 2017-03-16

fix key

[Heber Parrucci (heber013)]

Reply inline

[Omer Akram (om26er)]

ok, looks good to me.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'run_setup'
--- run_setup	2017-03-06 18:06:27 +0000
+++ run_setup	2017-03-16 20:41:47 +0000
@@ -49,7 +49,13 @@
 if [ -z "$profile" ]; then
     profile=staging
 fi
-ve/bin/python3 -m snappy_ecosystem_tests.environment.setup --mode ${mode} --profile ${profile}
+
+if [ -z "$proxy" ]; then
+    ve/bin/python3 -m snappy_ecosystem_tests.environment.setup --mode ${mode} --profile ${profile}
+else
+    ve/bin/python3 -m snappy_ecosystem_tests.environment.setup --mode ${mode} --profile ${profile} --proxy ${proxy}
+fi
+
 
 result=$?
 deactivate

=== modified file 'snappy_ecosystem_tests/commons/config.py'
--- snappy_ecosystem_tests/commons/config.py	2017-02-15 19:14:19 +0000
+++ snappy_ecosystem_tests/commons/config.py	2017-03-16 20:41:47 +0000
@@ -39,8 +39,7 @@
 
 def get_user_config_dir():
     """Return the path to the user configuration directory."""
-    conf_dir = os.environ.get(
-        'XDG_USER_CONFIG_HOME', os.path.expanduser('~/.config'))
+    conf_dir = os.environ.get('config')
     return conf_dir
 
 

=== modified file 'snappy_ecosystem_tests/environment/containers/lxd.py'
--- snappy_ecosystem_tests/environment/containers/lxd.py	2017-03-16 14:48:13 +0000
+++ snappy_ecosystem_tests/environment/containers/lxd.py	2017-03-16 20:41:47 +0000
@@ -32,8 +32,7 @@
     DEFAULT_CONTAINER_CONFIG)
 
 LOGGER = logging.getLogger(__name__)
-DOMAIN_PING = 'ubuntu.com'
-VARIABLES = ['https_proxy', 'http_proxy']
+DOMAIN_PING = 'http://cloud-images.ubuntu.com/releases'
 
 
 class LXDDriver:
@@ -141,36 +140,27 @@
             "The container {} does not have an IPV4 connection".format(
                 container.name))
 
-    def export_environment_variables(self, container, environment_variables):
+    def export_environment_variables(self, container, environment_variables,
+                                     proxy):
         """Export permanent environment variables inside container."""
         for key, value in environment_variables.items():
             self._execute_command(
                 container,
                 'echo \'{}={}\' >> /etc/environment'.format(key, value))
-        self.set_variables(VARIABLES, container)
-
-    def set_variables(self, variables, container):
-        """Read given environment variables in the host and set to
-         the container"""
-        for var in variables:
-            self._set_variable(var, container)
-
-    def _set_variable(self, variable, container):
-        """Read the given variable in the host and set to the container"""
-        value = os.environ.get(variable)
-        if value:
+        if proxy:
+            key = 'https_proxy' if proxy.startswith('https') else 'http_proxy'
             self._execute_command(
                 container,
-                'echo \'{}={}\' >> /etc/environment'.format(variable,
-                                                            value))
+                'echo \'{}={}\' >> /etc/environment'.format(key, proxy))
+        container.restart(wait=True)
 
     def wait_for_internet(self, container, attempts_count=30,
                           attempt_interval=1, ping_domain=DOMAIN_PING):
         """Wait for internet connectivity in the container."""
         for _ in range(attempts_count):
             try:
-                self._execute_command(
-                    container, 'curl -I {}'.format(ping_domain))
+                command = 'curl -I {}'.format(ping_domain)
+                self._execute_command(container, command)
                 break
             except ValueError:
                 LOGGER.info('Sleeping for %s second(s)', attempt_interval)

=== modified file 'snappy_ecosystem_tests/environment/managers.py'
--- snappy_ecosystem_tests/environment/managers.py	2017-03-10 12:38:22 +0000
+++ snappy_ecosystem_tests/environment/managers.py	2017-03-16 20:41:47 +0000
@@ -39,14 +39,15 @@
     def __init__(self):
         self.driver = LXDDriver()
 
-    def setup(self, profile):
+    def setup(self, profile, proxy=None):
         """setup the container based on the profile"""
         containers = self.driver.launch(CONTAINERS)
         for cont in containers:
+            self.driver.export_environment_variables(
+                cont,
+                PROFILES[profile][cont.name]["environment_variables"],
+                proxy=proxy)
             self.driver.wait_for_internet(cont)
-            self.driver.export_environment_variables(
-                cont,
-                PROFILES[profile][cont.name]["environment_variables"])
             self.driver.add_ppas(
                 cont,
                 PROFILES[profile][cont.name]["ppas"])

=== modified file 'snappy_ecosystem_tests/environment/setup.py'
--- snappy_ecosystem_tests/environment/setup.py	2017-03-10 09:47:49 +0000
+++ snappy_ecosystem_tests/environment/setup.py	2017-03-16 20:41:47 +0000
@@ -42,10 +42,10 @@
         raise RuntimeError("Mode: {} is not supported".format(mode))
 
 
-def main(mode, profile):
+def main(mode, profile, proxy):
     """Main script"""
     manager = get_manager(mode)
-    manager.setup(profile)
+    manager.setup(profile, proxy)
 
 
 if __name__ == '__main__':
@@ -54,5 +54,7 @@
     PARSER.add_argument('--mode', default="lxd", help='lxd')
     PARSER.add_argument('--profile', default="staging",
                         help='Profile to configure the environment')
+    PARSER.add_argument('--proxy', default=None,
+                        help='Proxy to use in the target machine/s')
     ARGS = PARSER.parse_args()
-    main(ARGS.mode, ARGS.profile)
+    main(ARGS.mode, ARGS.profile, ARGS.proxy)

=== modified file 'snappy_ecosystem_tests/run.py'
--- snappy_ecosystem_tests/run.py	2017-03-08 17:29:20 +0000
+++ snappy_ecosystem_tests/run.py	2017-03-16 20:41:47 +0000
@@ -36,6 +36,9 @@
                         required=False)
     parser.add_argument('--target', default="lxd",
                         help='Target on which tests will be executed.')
+    parser.add_argument('--config', default=os.path.expanduser(
+        '~/.config/ecosystem_tests.cfg'),
+                        help='User config file.')
     ecosystem_args, pytest_args = parser.parse_known_args()
     _set_env_variables(ecosystem_args)
     return pytest_args