Skip to content

L
lxc
Commit f69fd24e by Stéphane Graber
Options

tests: Avoid the download template when possible

The use of the download template with an hardcoded --arch=amd64 in aa.c was causing test failures on any platform incapable of running amd64 binaries. This wasn't noticed in the CI environment as we run the tests within containers on an amd64 kernel but this caused failures on the Ubuntu CI environment. Instead, let's use the busybox template, tweaking the configuration when needed to match the needs of the testcase. Signed-off-by: 's avatarStéphane Graber <stgraber@ubuntu.com> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent 6ebc0504
Showing with 7 additions and 1 deletion
src/tests/aa.c
...@@ -164,10 +164,16 @@ int main(int argc, char *argv[]) ...@@ -164,10 +164,16 @@ int main(int argc, char *argv[])
goto err; goto err;
} }
c->save_config(c, NULL); c->save_config(c, NULL);
if (!c->createl(c, "download", NULL, NULL, 0, "-d", "ubuntu", "-r", "trusty", "-a", "amd64", NULL)) { if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
fprintf(stderr, "%s: %d: failed to create container\n", __FILE__, __LINE__); fprintf(stderr, "%s: %d: failed to create container\n", __FILE__, __LINE__);
goto err; goto err;
} }
c->clear_config_item(c, "lxc.mount.auto");
c->set_config_item(c, "lxc.mount.entry", "proc proc proc");
c->set_config_item(c, "lxc.mount.entry", "sysfs sys sysfs");
c->save_config(c, NULL);
c->want_daemonize(c, true); c->want_daemonize(c, true);
if (!c->startl(c, 0, NULL)) { if (!c->startl(c, 0, NULL)) {
fprintf(stderr, "Error starting container\n"); fprintf(stderr, "Error starting container\n");
......
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