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 e0d163bb authored by Harald Sitter's avatar Harald Sitter 🌼

Revert "add a new isolater permutation for CI use"

This reverts commit d607a1a2.

Wasn't improving anything. So drop excess code again
parent d607a1a2
......@@ -70,14 +70,6 @@ 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
......@@ -91,8 +83,7 @@ class NoIsolator < Isolator
end
def new_isolator
return NoIsolator.new if ENV['NO_ISOLATOR']
return CIIsolator.new if ENV['JENKINS_SERVER_COOKIE']
return NoIsolator.new if ENV['JENKINS_SERVER_COOKIE'] || ENV['NO_ISOLATOR']
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