From 9376043e9d7e6b1074c7501f49795237a3ecad15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20Suszy=C5=84ski?= Date: Thu, 14 Nov 2019 20:25:19 +0100 Subject: [PATCH 1/2] Adding Goland to gitignore Also adding some extra OWNER files and test-infra/devstats from vendor directory that shouldn't be commited --- .gitignore | 3 +++ hack/update-deps.sh | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7c504700..44c5d080 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # Temporary Build Files build/_output build/_test +# Goland +.idea + # Created by https://www.gitignore.io/api/go,vim,emacs,visualstudiocode ### Emacs ### # -*- mode: gitignore; -*- diff --git a/hack/update-deps.sh b/hack/update-deps.sh index 997832a1..ec0e1bc1 100755 --- a/hack/update-deps.sh +++ b/hack/update-deps.sh @@ -20,13 +20,13 @@ set -o pipefail source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/library.sh -cd ${REPO_ROOT_DIR} +cd "${REPO_ROOT_DIR}" # Ensure we have everything we need under vendor/ dep ensure -rm -rf $(find vendor/ -name 'OWNERS') -rm -rf $(find vendor/ -name '*_test.go') +find vendor/ -name 'OWNERS' -delete +find vendor/ -name '*_test.go' -delete update_licenses third_party/VENDOR-LICENSE "./cmd/*" From 15b182e68e5e641458f1b8d1b991f242d4d03d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20Suszy=C5=84ski?= Date: Thu, 14 Nov 2019 21:25:14 +0100 Subject: [PATCH 2/2] Letting flags be changed from outside This commit let change test flags from outside. It can be done either by: * declaring environmental variables: `TEST_NAMESPACE`, and `TEST_RESOURCE`, * using `-ldflags "-X knative.dev/serving-operator/test.ServingOperatorNamespace=knative-serving"` Changing those flags is needed to perform tests on RH operators. --- test/e2e_flags.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test/e2e_flags.go b/test/e2e_flags.go index f7dc4f3f..e6b8b102 100644 --- a/test/e2e_flags.go +++ b/test/e2e_flags.go @@ -19,9 +19,19 @@ limitations under the License. package test -const ( +import "os" + +var ( // ServingOperatorNamespace is the default namespace for serving operator e2e tests - ServingOperatorNamespace = "operator-tests" + ServingOperatorNamespace = getenv("TEST_NAMESPACE", "operator-tests") // ServingOperatorName is the default operator name for serving operator e2e tests - ServingOperatorName = "knative-serving" + ServingOperatorName = getenv("TEST_RESOURCE", "knative-serving") ) + +func getenv(name, defaultValue string) string { + value, set := os.LookupEnv(name) + if !set { + value = defaultValue + } + return value +}