diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile | 33 | ||||
| -rw-r--r-- | edge/Makefile | 8 | ||||
| -rw-r--r-- | edgesite/Makefile | 7 |
4 files changed, 19 insertions, 31 deletions
diff --git a/.travis.yml b/.travis.yml index 762ad4e76..48be9a718 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ jobs: - sudo apt-get update - sudo apt-get install -y kubectl script: - - make e2e_test + - make e2e - name: "build docker images on amd64" arch: amd64 script: @@ -202,26 +202,29 @@ smallbuild: endif -#################################### - - -.PHONY: edge_small_build -edge_small_build: - cd edge && $(MAKE) small_build - -.PHONY: edgesite_small_build -edgesite_small_build: - $(MAKE) -C edgesite small_build +define E2E_HELP_INFO +# e2e test. +# +# Example: +# make e2e +# make e2e HELP=y +# +endef -.PHONY: e2e_test -e2e_test: +.PHONY: e2e +ifeq ($(HELP),y) +e2e: + @echo "$$E2E_HELP_INFO" +else +e2e: # bash tests/e2e/scripts/execute.sh device_crd # This has been commented temporarily since there is an issue of CI using same master for all PRs, which is causing failures when run parallely bash tests/e2e/scripts/execute.sh +endif + + +#################################### -.PHONY: performance_test -performance_test: - bash tests/performance/scripts/jenkins.sh QEMU_ARCH ?= x86_64 ARCH ?= amd64 diff --git a/edge/Makefile b/edge/Makefile index 00268472f..7fcb33c5f 100644 --- a/edge/Makefile +++ b/edge/Makefile @@ -1,11 +1,3 @@ .PHONY: clean clean: bash -x hack/clean.sh - -.PHONY: small_build -small_build: verify - go build -ldflags="-w -s -extldflags -static" cmd/edgecore/edgecore.go - # There are options in upx-ucl like --best, which has best compression, - # but also has a drawback of taking too long for big files, we are using -9 since it takes less time - # Pls use --help for more information - upx-ucl -9 edgecore diff --git a/edgesite/Makefile b/edgesite/Makefile deleted file mode 100644 index e4b359948..000000000 --- a/edgesite/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -.PHONY: small_build -small_build: verify - go build -ldflags="-w -s -extldflags -static" cmd/edgesite/edgesite.go - # There are options in upx-ucl like --best, which has best compression, - # but also has a drawback of taking too long for big files, we are using -9 since it takes less time - # Pls use --help for more information - upx-ucl -9 edgesite |