Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit d607a1a2 authored by Harald Sitter's avatar Harald Sitter 🌼

add a new isolater permutation for CI use

the way I see it right now the test passes but cleanup isn't working
which is no suprise given cleanup is meant to be done by x dying. in the
new isolator preserve the env but isolate x->dbus->*
parent 9d503d39
......@@ -70,6 +70,14 @@ class XvfbIsolator < Isolator
end
end
# Isolates for build.kde.org. No env but xvfb spinup.
class CIIsolator < XvfbIsolator
def mangle_env(*)
# noop, we need to defer to Jenkins for the env so cleanup doesn't break
end
end
# No isolation whatsoever.
class NoIsolator < Isolator
def mangle_env(*)
# noop without isolation
......@@ -83,7 +91,8 @@ class NoIsolator < Isolator
end
def new_isolator
return NoIsolator.new if ENV['JENKINS_SERVER_COOKIE'] || ENV['NO_ISOLATOR']
return NoIsolator.new if ENV['NO_ISOLATOR']
return CIIsolator.new if ENV['JENKINS_SERVER_COOKIE']
return XephyrIsolator.new if ENV['XEPHYR']
XvfbIsolator.new
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment