diff --git a/buildbot/slave/files/config/buildbot.tac b/buildbot/slave/files/config/buildbot.tac index 26f446af..f2685daf 100644 --- a/buildbot/slave/files/config/buildbot.tac +++ b/buildbot/slave/files/config/buildbot.tac @@ -1,4 +1,3 @@ - import os from buildslave.bot import BuildSlave diff --git a/common/init.sls b/common/init.sls index c433ba7f..5884ddec 100644 --- a/common/init.sls +++ b/common/init.sls @@ -39,6 +39,18 @@ virtualenv: - require: - pkg: pip +# Prereqs for making SNI work, slaves run tests where they load an https page +{% if grains['os'] == 'Ubuntu' %} +https-sni-deps: + pip.installed: + - pkgs: + - pyopenssl + - ndg-httpsclient + - pyasn1 + - require: + - pkg: pip +{% endif %} + servo: user.present: - fullname: Tom Servo