1
=== modified file 'python/libertine/LxcContainer.py'
2
--- python/libertine/LxcContainer.py	2016-09-06 12:36:47 +0000
3
+++ python/libertine/LxcContainer.py	2016-09-07 19:08:46 +0000
4
@@ -12,6 +12,7 @@
5
12
# You should have received a copy of the GNU General Public License along
12
# You should have received a copy of the GNU General Public License along
6
13
# with this program.  If not, see <http://www.gnu.org/licenses/>.
13
# with this program.  If not, see <http://www.gnu.org/licenses/>.
7
14
14
8
15
import contextlib
9
15
import crypt
16
import crypt
10
16
import dbus
17
import dbus
11
17
import lxc
18
import lxc
12
@@ -72,6 +73,31 @@
13
72
    return host_timezone
73
    return host_timezone
14
73
74
15
74
75
16
76
class EnvLxcSettings(contextlib.ExitStack):
17
77
    """
18
78
    Helper object providing a way to set the proxies for testing
19
79
20
80
    When running smoke tests on Jenkins, LXC create operations need the proxies
21
81
    set, but subsequent apt operations cannot have the proxies set.  This will
22
82
    set the proxies when called and unset the proxies when the context is
23
83
    destroyed.
24
84
    """
25
85
    def __init__(self):
26
86
        super().__init__()
27
87
        self.set_proxy_env()
28
88
        self.callback(lambda: self.del_proxy_env())
29
89
30
90
    def set_proxy_env(self):
31
91
        if 'LIBERTINE_JENKAAS_TESTING' in os.environ:
32
92
            os.environ['http_proxy'] = 'http://squid.internal:3128'
33
93
            os.environ['https_proxy'] = 'https://squid.internal:3128'
34
94
35
95
    def del_proxy_env(self):
36
96
        if 'LIBERTINE_JENKAAS_TESTING' in os.environ:
37
97
            del os.environ['http_proxy']
38
98
            del os.environ['https_proxy']
39
99
40
100
            
41
75
class LibertineLXC(BaseContainer):
101
class LibertineLXC(BaseContainer):
42
76
    """
102
    """
43
77
    A concrete container type implemented using an LXC container.
103
    A concrete container type implemented using an LXC container.
44
@@ -181,12 +207,13 @@
45
181
207
46
182
        utils.create_libertine_user_data_dir(self.container_id)
208
        utils.create_libertine_user_data_dir(self.container_id)
47
183
209
54
184
        if not self.container.create("download", 0,
210
        with EnvLxcSettings():
55
185
                                     {"dist": "ubuntu",
211
            if not self.container.create("download", 0,
56
186
                                      "release": self.installed_release,
212
                                         {"dist": "ubuntu",
57
187
                                      "arch": self.architecture}):
213
                                          "release": self.installed_release,
58
188
            print("Failed to create container")
214
                                          "arch": self.architecture}):
59
189
            return False
215
                print("Failed to create container")
60
216
                return False
61
190
217
62
191
        self.create_libertine_config()
218
        self.create_libertine_config()
63
192
219
Status:	Merged
Approved by:	Christopher Townsend on 2016-09-07
Approved revision:	300
Merged at revision:	298
Proposed branch:	lp:~townsend/libertine/smoke-test-workaround
Merge into:	lp:libertine
Diff against target:	62 lines (+33/-6) 1 file modified python/libertine/LxcContainer.py (+33/-6)
To merge this branch:	bzr merge lp:~townsend/libertine/smoke-test-workaround
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Libertine CI Bot	continuous-integration		Approve on 2016-09-07
Larry Price		2016-09-01	Approve on 2016-09-02
Review via email: mp+304665@code.launchpad.net