From 169358717a60d5f46ee8697ad5a3b5ee191b9f99 Mon Sep 17 00:00:00 2001 From: Tigran Najaryan Date: Mon, 9 Dec 2019 13:54:42 -0500 Subject: [PATCH] Add end-to-end test execution to Continuous Integration - Now end-to-end tests from the Testbed are executed as part of CirleCI build. - Test summary are published in CircleCI using JUnit format. - All test result files (e.g. logs) are published as CircleCO artifacts. --- .circleci/config.yml | 4 ++++ Makefile | 2 ++ testbed/go.sum | 1 + 3 files changed, 7 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed5c242fa845..1849b6bb450e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,3 +16,7 @@ jobs: - run: name: Verify command: make ci + - store_artifacts: + path: testbed/tests/results + - store_test_results: + path: testbed/tests/results/junit diff --git a/Makefile b/Makefile index e57f7807528b..5ef0073e3f1b 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,8 @@ e2e-test: otelcontribcol .PHONY: ci ci: all test-with-cover + $(MAKE) -C testbed install-tools + $(MAKE) -C testbed runtests .PHONY: test-with-cover test-with-cover: diff --git a/testbed/go.sum b/testbed/go.sum index ba10b67fcc3e..f97a3a7a051f 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -291,6 +291,7 @@ github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBv github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024 h1:rBMNdlhTLzJjJSDIjNEXX1Pz3Hmwmz91v+zycvx9PJc= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=