From bbe80787555a55478802aab875246cbbfa4f878d Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Thu, 13 Apr 2017 12:56:11 +0100 Subject: [PATCH 1/2] moby: add skip-cleanup flag to moby run gcp This is used as the CI will cleanup after itself Signed-off-by: Dave Tucker --- src/cmd/moby/run_gcp.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cmd/moby/run_gcp.go b/src/cmd/moby/run_gcp.go index f8d8b3e9c..b983b05b4 100644 --- a/src/cmd/moby/run_gcp.go +++ b/src/cmd/moby/run_gcp.go @@ -45,6 +45,7 @@ func runGcp(args []string) { familyFlag := gcpCmd.String("family", "", "GCP Image Family. A group of images where the family name points to the most recent image. *Optional* when 'prefix' is a filename") nameFlag := gcpCmd.String("img-name", "", "Overrides the Name used to identify the file in Google Storage, Image and Instance. Defaults to [name]") diskSizeFlag := gcpCmd.Int("disk-size", 0, "Size of system disk in GB") + skipCleanup := gcpCmd.Bool("skip-cleanup", false, "Don't remove images or VMs") if err := gcpCmd.Parse(args); err != nil { log.Fatal("Unable to parse args") @@ -107,7 +108,9 @@ func runGcp(args []string) { log.Fatal(err) } - if err = client.DeleteInstance(name, zone, true); err != nil { - log.Fatal(err) + if !*skipCleanup { + if err = client.DeleteInstance(name, zone, true); err != nil { + log.Fatal(err) + } } } From 11742d01489bfb93637b4092636937fedec38fe3 Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Thu, 13 Apr 2017 13:00:48 +0100 Subject: [PATCH 2/2] makefile: Add target for LTP tests This adds a target that runs the LTP tests This target will be run on master and tag builds in CI Signed-off-by: Dave Tucker --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4996eb78f..6552ccd94 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ install: cp -R ./bin/* $(PREFIX)/bin define check_test_log - @cat $1 |grep -q 'Kernel config test suite PASSED' + @cat $1 |grep -q 'test suite PASSED' endef .PHONY: test-hyperkit @@ -71,16 +71,26 @@ test: test-initrd.img test-bzImage test-cmdline tar cf - $^ | ./scripts/qemu.sh 2>&1 | tee test.log $(call check_test_log, test.log) +test-ltp.img.tar.gz: $(MOBY) test/ltp/test-ltp.yml + $(MOBY) build test/ltp/test-ltp.yml + +.PHONY: test-ltp +test-ltp: $(MOBY) test-ltp.img.tar.gz + $(MOBY) run gcp -skip-cleanup -machine n1-highcpu-4 test-ltp.img.tar.gz | tee test-ltp.log + $(call check_test_log, test-ltp.log) + .PHONY: ci ci-tag ci-pr ci: $(MAKE) clean $(MAKE) $(MAKE) test + $(MAKE) test-ltp ci-tag: $(MAKE) clean $(MAKE) $(MAKE) test + $(MAKE) test-ltp ci-pr: $(MAKE) clean