Add FreeBSD Jail execution environment support #224
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,3 +10,4 @@ | |
|
|
||
| * The FreeBSD Foundation | ||
| * Google Inc. | ||
| * Igor Ostapenko <pm@igoro.pro> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,6 +63,8 @@ static const char* const default_metadata = | |
| "allowed_architectures is empty\n" | ||
| "allowed_platforms is empty\n" | ||
| "description is empty\n" | ||
| "execenv is empty\n" | ||
ngie-eign marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "execenv_jail_params is empty\n" | ||
| "has_cleanup = false\n" | ||
| "is_exclusive = false\n" | ||
| "required_configs is empty\n" | ||
|
|
@@ -80,6 +82,8 @@ static const char* const overriden_metadata = | |
| "allowed_architectures is empty\n" | ||
| "allowed_platforms is empty\n" | ||
| "description = Textual description\n" | ||
| "execenv is empty\n" | ||
| "execenv_jail_params is empty\n" | ||
| "has_cleanup = false\n" | ||
| "is_exclusive = false\n" | ||
| "required_configs is empty\n" | ||
|
|
@@ -199,6 +203,8 @@ ATF_TEST_CASE_BODY(junit_metadata__overrides) | |
| .add_allowed_architecture("arch1") | ||
| .add_allowed_platform("platform1") | ||
| .set_description("This is a test") | ||
| .set_execenv("jail") | ||
| .set_execenv_jail_params("vnet") | ||
| .set_has_cleanup(true) | ||
| .set_is_exclusive(true) | ||
| .add_required_config("config1") | ||
|
|
@@ -215,6 +221,8 @@ ATF_TEST_CASE_BODY(junit_metadata__overrides) | |
| + "allowed_architectures = arch1\n" | ||
| + "allowed_platforms = platform1\n" | ||
| + "description = This is a test\n" | ||
| + "execenv = jail\n" | ||
| + "execenv_jail_params = vnet\n" | ||
| + "has_cleanup = true\n" | ||
| + "is_exclusive = true\n" | ||
| + "required_configs = config1\n" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,11 +26,11 @@ | |
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| ENGINE_CFLAGS = $(STORE_CFLAGS) $(MODEL_CFLAGS) $(UTILS_CFLAGS) $(ENGINE_EXECENV_CFLAGS) | ||
| ENGINE_LIBS = libengine.la $(STORE_LIBS) $(MODEL_LIBS) $(UTILS_LIBS) $(ENGINE_EXECENV_LIBS) | ||
|
|
||
| noinst_LTLIBRARIES += libengine.la | ||
| libengine_la_CPPFLAGS = $(STORE_CFLAGS) $(UTILS_CFLAGS) $(ENGINE_EXECENV_CFLAGS) | ||
| libengine_la_SOURCES = engine/atf.cpp | ||
| libengine_la_SOURCES += engine/atf.hpp | ||
| libengine_la_SOURCES += engine/atf_list.cpp | ||
|
|
@@ -153,3 +153,5 @@ engine_scheduler_test_SOURCES = engine/scheduler_test.cpp | |
| engine_scheduler_test_CXXFLAGS = $(ENGINE_CFLAGS) $(ATF_CXX_CFLAGS) | ||
| engine_scheduler_test_LDADD = $(ENGINE_LIBS) $(ATF_CXX_LIBS) | ||
| endif | ||
|
|
||
| include engine/execenv/Makefile.am.inc | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,6 +39,7 @@ extern "C" { | |
| #include "engine/atf_list.hpp" | ||
| #include "engine/atf_result.hpp" | ||
| #include "engine/exceptions.hpp" | ||
| #include "engine/execenv/execenv.hpp" | ||
| #include "model/test_case.hpp" | ||
| #include "model/test_program.hpp" | ||
| #include "model/test_result.hpp" | ||
|
|
@@ -54,6 +55,7 @@ extern "C" { | |
| #include "utils/stream.hpp" | ||
|
|
||
| namespace config = utils::config; | ||
| namespace execenv = engine::execenv; | ||
| namespace fs = utils::fs; | ||
| namespace process = utils::process; | ||
|
|
||
|
|
@@ -190,7 +192,10 @@ engine::atf_interface::exec_test(const model::test_program& test_program, | |
|
|
||
| args.push_back(F("-r%s") % (control_directory / result_name)); | ||
| args.push_back(test_case_name); | ||
|
|
||
| auto e = execenv::get(test_program, test_case_name); | ||
| e->init(); | ||
| e->exec(args); | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -219,7 +224,9 @@ engine::atf_interface::exec_cleanup( | |
| } | ||
|
|
||
| args.push_back(F("%s:cleanup") % test_case_name); | ||
|
|
||
| auto e = execenv::get(test_program, test_case_name); | ||
| e->exec(args); | ||
| } | ||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -121,6 +121,10 @@ engine::parse_atf_metadata(const model::properties_map& props) | |
| mdbuilder.set_string("has_cleanup", value); | ||
| } else if (name == "require.arch") { | ||
| mdbuilder.set_string("allowed_architectures", value); | ||
| } else if (name == "execenv") { | ||
| mdbuilder.set_string("execenv", value); | ||
| } else if (name == "execenv.jail.params") { | ||
| mdbuilder.set_string("execenv_jail_params", value); | ||
| } else if (name == "require.config") { | ||
| mdbuilder.set_string("required_configs", value); | ||
| } else if (name == "require.files") { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,7 @@ | |
| #include <stdexcept> | ||
|
|
||
| #include "engine/exceptions.hpp" | ||
| #include "engine/execenv/execenv.hpp" | ||
| #include "utils/config/exceptions.hpp" | ||
| #include "utils/config/parser.hpp" | ||
| #include "utils/config/tree.ipp" | ||
|
|
@@ -43,6 +44,7 @@ | |
| #include "utils/text/operations.ipp" | ||
|
|
||
| namespace config = utils::config; | ||
| namespace execenv = engine::execenv; | ||
| namespace fs = utils::fs; | ||
| namespace passwd = utils::passwd; | ||
| namespace text = utils::text; | ||
|
|
@@ -59,6 +61,7 @@ static void | |
| init_tree(config::tree& tree) | ||
| { | ||
| tree.define< config::string_node >("architecture"); | ||
| tree.define< config::strings_set_node >("execenvs"); | ||
| tree.define< config::positive_int_node >("parallelism"); | ||
| tree.define< config::string_node >("platform"); | ||
| tree.define< engine::user_node >("unprivileged_user"); | ||
|
|
@@ -74,6 +77,14 @@ static void | |
| set_defaults(config::tree& tree) | ||
| { | ||
| tree.set< config::string_node >("architecture", KYUA_ARCHITECTURE); | ||
|
|
||
| std::set< std::string > supported; | ||
| for (auto em : execenv::execenvs()) | ||
| if (em->is_supported()) | ||
| supported.insert(em->name()); | ||
| supported.insert(execenv::default_execenv_name); | ||
| tree.set< config::strings_set_node >("execenvs", supported); | ||
|
|
||
| // TODO(jmmv): Automatically derive this from the number of CPUs in the | ||
| // machine and forcibly set to a value greater than 1. Still testing | ||
| // the new parallel implementation as of 2015-02-27 though. | ||
|
|
@@ -229,6 +240,13 @@ engine::empty_config(void) | |
| { | ||
| config::tree tree(false); | ||
| init_tree(tree); | ||
|
|
||
| // Tests of Kyua itself tend to use an empty config, i.e. default | ||
| // execution environment is used. Let's allow it. | ||
| std::set< std::string > supported; | ||
| supported.insert(engine::execenv::default_execenv_name); | ||
| tree.set< config::strings_set_node >("execenvs", supported); | ||
|
|
||
| return tree; | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mentioning what execenv's are supported would be a good idea -- otherwise it's unclear (without looking at the source code) what is or isn't supported.
Referencing alternative documentation is a good thing to do in place of hardcoding the values, but I think being explicit avoids the need for the documentation potentially becoming out of sync/less implicit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's already covered in
kyuafile.5: https://github.com/ihoro/kyua/blob/9721be7abbd48f2ee020e5deaee1e1daa44c0087/doc/kyuafile.5.in#L181I guess we could simply make a reference to the
kyuafile.5for the possible values.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added the mentioned reference.