From edd3258c0af266a7008fe99aadefeebde66d8cda Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Thu, 8 Oct 2020 17:54:03 -0500 Subject: [PATCH] Update gitignore and some verify scripts for new e2e code --- .gitignore | 3 +++ hack/update-bazel.sh | 1 + hack/verify-bazel.sh | 1 + hack/verify-staticcheck.sh | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 95bbddc234..ea983d20eb 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,6 @@ _output # Used to cache terraform providers etc during testing .cache/ + +# Used by E2E testing +_artifacts diff --git a/hack/update-bazel.sh b/hack/update-bazel.sh index eb5ba28c53..15a88f3450 100755 --- a/hack/update-bazel.sh +++ b/hack/update-bazel.sh @@ -29,6 +29,7 @@ GOBIN="${TMP_OUT}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/g "${TMP_OUT}/gazelle" fix \ -external=vendored \ + -exclude=tests/e2e \ -mode=fix \ -proto=disable \ -repo_root="${KOPS_ROOT}" diff --git a/hack/verify-bazel.sh b/hack/verify-bazel.sh index 5ec1bfbd61..2c7e5f63c3 100755 --- a/hack/verify-bazel.sh +++ b/hack/verify-bazel.sh @@ -24,6 +24,7 @@ GOBIN="${TMP_OUT}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/g gazelle_diff=$("${TMP_OUT}/gazelle" fix \ -external=vendored \ + -exclude=tests/e2e \ -mode=diff \ -proto=disable \ -repo_root="${KOPS_ROOT}") diff --git a/hack/verify-staticcheck.sh b/hack/verify-staticcheck.sh index 92bf3a0e51..9f550f2760 100755 --- a/hack/verify-staticcheck.sh +++ b/hack/verify-staticcheck.sh @@ -79,7 +79,7 @@ while IFS='' read -r line; do all_packages+=("./$line") done < <( find -H . -type f -name \*.go | sed 's|/[^/]*$||' | sed 's|^./||' | LC_ALL=C sort -u | grep "^${FOCUS:-.}" | - grep -vE "(third_party|generated|clientset_generated|vendor|/_)" | + grep -vE "(third_party|generated|clientset_generated|vendor|/_|tests/e2e)" | # Temporarily ignoring tests/e2e because it is a separate go module grep -vE "$ignore_pattern" ) failing_packages=()