From aeae7e889d3c8bba335f6630c076f2f1bad9aead Mon Sep 17 00:00:00 2001 From: Metallion Date: Wed, 14 Feb 2018 18:10:53 +0900 Subject: [PATCH 1/3] Add a log file for lxc console. This is useful for debugging a container's boot process --- hypervisor/lxc/lxc.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hypervisor/lxc/lxc.go b/hypervisor/lxc/lxc.go index 11e89576..7224d6f1 100644 --- a/hypervisor/lxc/lxc.go +++ b/hypervisor/lxc/lxc.go @@ -176,6 +176,9 @@ func (d *LXCHypervisorDriver) modifyConf() error { } defer lxcconf.Close() + // Log boot process to a file for debugging purposes + fmt.Fprintf(lxcconf, "\nlxc.console.logfile = %s\n\n", filepath.Join(d.containerDir(), "console.log")) + // Append comment header fmt.Fprintf(lxcconf, "\n# OpenVDC Network Configuration\n") From fa25f9905826984aa7b2ea36ed9ab413be4d98fa Mon Sep 17 00:00:00 2001 From: Metallion Date: Wed, 14 Feb 2018 18:42:29 +0900 Subject: [PATCH 2/3] Removed an excessive linebreak --- hypervisor/lxc/lxc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypervisor/lxc/lxc.go b/hypervisor/lxc/lxc.go index 7224d6f1..c2935867 100644 --- a/hypervisor/lxc/lxc.go +++ b/hypervisor/lxc/lxc.go @@ -177,7 +177,7 @@ func (d *LXCHypervisorDriver) modifyConf() error { defer lxcconf.Close() // Log boot process to a file for debugging purposes - fmt.Fprintf(lxcconf, "\nlxc.console.logfile = %s\n\n", filepath.Join(d.containerDir(), "console.log")) + fmt.Fprintf(lxcconf, "\nlxc.console.logfile = %s\n", filepath.Join(d.containerDir(), "console.log")) // Append comment header fmt.Fprintf(lxcconf, "\n# OpenVDC Network Configuration\n") From 889e61473ba898253edeca63297e3a375e0dd4af Mon Sep 17 00:00:00 2001 From: Metallion Date: Tue, 24 Jul 2018 16:50:24 +0900 Subject: [PATCH 3/3] Disabled the esxi test stage in the Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cd076a85..aac8af83 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -126,5 +126,6 @@ for( label in build_nodes) { stage_unit_test(label) stage_rpmbuild(label) stage_acceptance(label) - stage_acceptance_esxi(label) + // Esxi is currently unmaintained and needs to be removed from the code. + //stage_acceptance_esxi(label) }