From 8e423a91b77e864395f83cd7dc914ecfc60f5d37 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Tue, 20 Dec 2022 16:03:20 -0600 Subject: [PATCH 1/3] Remove e2e Testing on circleci Signed-off-by: Ken Sipe --- .circleci/config.yml | 21 --------------------- hack/run-e2e-tests.sh | 28 ---------------------------- pkg/test/kind_integration_test.go | 2 +- 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100755 hack/run-e2e-tests.sh diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index c69c72e9..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Golang CircleCI 2.0 configuration file -# -# Check https://circleci.com/docs/2.0/language-go/ for more details -version: 2.1 -jobs: - e2e-test: - machine: true - steps: - - checkout - - run: echo 'export INTEGRATION_OUTPUT_JUNIT="true"' >> $BASH_ENV - - run: ./test/run_tests.sh e2e-test - - store_test_results: - path: reports/ - - store_artifacts: - path: kind-logs.tar.bz2 - -workflows: - version: 2 - e2e-test: - jobs: - - e2e-test diff --git a/hack/run-e2e-tests.sh b/hack/run-e2e-tests.sh deleted file mode 100755 index 29f9cfd6..00000000 --- a/hack/run-e2e-tests.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o nounset -set -o pipefail -set -o xtrace - -INTEGRATION_OUTPUT_JUNIT=${INTEGRATION_OUTPUT_JUNIT:-false} -VERSION=${VERSION:-test} - -if [ "$INTEGRATION_OUTPUT_JUNIT" == true ] -then - echo "Running E2E tests with junit output" - mkdir -p reports/ - go get github.com/jstemmer/go-junit-report - go install github.com/jstemmer/go-junit-report - go mod tidy - - ./bin/kubectl-kuttl test pkg/test/test_data/ 2>&1 \ - | tee /dev/fd/2 \ - | go-junit-report -set-exit-code \ - > reports/kuttl_e2e_test_report.xml - -else - echo "Running E2E tests without junit output" - - ./bin/kubectl-kuttl test pkg/test/test_data/ -fi diff --git a/pkg/test/kind_integration_test.go b/pkg/test/kind_integration_test.go index ca1525db..09c00916 100644 --- a/pkg/test/kind_integration_test.go +++ b/pkg/test/kind_integration_test.go @@ -1,4 +1,4 @@ -//go:build integration +//go:build e2e package test From 7c302fa4171f8524208201a06213a939e775aea3 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Tue, 20 Dec 2022 16:32:47 -0600 Subject: [PATCH 2/3] Simplify to integration test Signed-off-by: Ken Sipe --- pkg/test/kind_integration_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/test/kind_integration_test.go b/pkg/test/kind_integration_test.go index 09c00916..3ae3eaee 100644 --- a/pkg/test/kind_integration_test.go +++ b/pkg/test/kind_integration_test.go @@ -1,7 +1,10 @@ -//go:build e2e +//go:build integration package test +// This test file is the only test that requires docker on the platform. It may be worth creating a new build tag for that +// but adds complexity for 1 case. + import ( "bufio" "bytes" From 3d254f40c91d1c46eacadf2fcc539e0c762a93a2 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Tue, 3 Jan 2023 13:58:07 -0600 Subject: [PATCH 3/3] removal of file requires docker file removal as well Signed-off-by: Ken Sipe --- test/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Dockerfile b/test/Dockerfile index c269fcaa..47dc6ed5 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -17,6 +17,5 @@ RUN make download COPY pkg/ pkg/ COPY cmd/ cmd/ COPY hack/run-integration-tests.sh hack/run-integration-tests.sh -COPY hack/run-e2e-tests.sh hack/run-e2e-tests.sh COPY test/ test/ COPY kuttl-test.yaml kuttl-test.yaml