From 8a6a7f28ad92df0d9f70441d6ebb4de8e8ea0b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20H=C3=B6rl?= Date: Fri, 6 Dec 2019 13:54:51 +0000 Subject: [PATCH] [testing-framework] Cleanup & integrate - Remove redundant files - Remove all travis things - Update go.mod - Update OWNERS - Make sure the downloaded assets end up in the right place for the integration testing framework --- OWNERS_ALIASES | 4 + go.mod | 1 - go.sum | 2 - hack/check-everything.sh | 11 +- pkg/internal/testing/.travis.yml | 23 -- pkg/internal/testing/CONTRIBUTING.md | 13 -- pkg/internal/testing/LICENSE | 201 ------------------ pkg/internal/testing/OWNERS | 4 +- pkg/internal/testing/OWNERS_ALIASES | 12 -- pkg/internal/testing/README.md | 21 -- pkg/internal/testing/SECURITY_CONTACTS | 15 -- .../testing/bin/consider-early-travis-exit.sh | 37 ---- .../testing/bin/install-test-dependencies.sh | 6 - pkg/internal/testing/bin/pre-commit.sh | 37 ---- pkg/internal/testing/bin/test-on-prow.sh | 8 - pkg/internal/testing/code-of-conduct.md | 3 - pkg/internal/testing/go.mod | 16 -- pkg/internal/testing/go.sum | 23 -- pkg/internal/testing/integration/README.md | 2 + .../integration/scripts/download-binaries.sh | 48 ----- 20 files changed, 16 insertions(+), 471 deletions(-) delete mode 100644 pkg/internal/testing/.travis.yml delete mode 100644 pkg/internal/testing/CONTRIBUTING.md delete mode 100644 pkg/internal/testing/LICENSE delete mode 100644 pkg/internal/testing/OWNERS_ALIASES delete mode 100644 pkg/internal/testing/README.md delete mode 100644 pkg/internal/testing/SECURITY_CONTACTS delete mode 100644 pkg/internal/testing/bin/consider-early-travis-exit.sh delete mode 100755 pkg/internal/testing/bin/install-test-dependencies.sh delete mode 100755 pkg/internal/testing/bin/pre-commit.sh delete mode 100755 pkg/internal/testing/bin/test-on-prow.sh delete mode 100644 pkg/internal/testing/code-of-conduct.md delete mode 100644 pkg/internal/testing/go.mod delete mode 100644 pkg/internal/testing/go.sum delete mode 100755 pkg/internal/testing/integration/scripts/download-binaries.sh diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index dd68030d96..f6675ccb21 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -11,3 +11,7 @@ aliases: - shawn-hurley - gerred - joelanford + testing-integration-admins: + - apelisse + - hoegaarden + - totherme diff --git a/go.mod b/go.mod index e31d7a58ce..84e4becab6 100644 --- a/go.mod +++ b/go.mod @@ -26,6 +26,5 @@ require ( k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90 k8s.io/utils v0.0.0-20190801114015-581e00157fb1 - sigs.k8s.io/testing_frameworks v0.1.2 sigs.k8s.io/yaml v1.1.0 ) diff --git a/go.sum b/go.sum index 8f6a90aac6..a13eaade9c 100644 --- a/go.sum +++ b/go.sum @@ -381,7 +381,5 @@ modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= -sigs.k8s.io/testing_frameworks v0.1.2 h1:vK0+tvjF0BZ/RYFeZ1E6BYBwHJJXhjuZ3TdsEKH+UQM= -sigs.k8s.io/testing_frameworks v0.1.2/go.mod h1:ToQrwSC3s8Xf/lADdZp3Mktcql9CG0UAmdJG9th5i0w= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/hack/check-everything.sh b/hack/check-everything.sh index 4334f54bce..dc6987011b 100755 --- a/hack/check-everything.sh +++ b/hack/check-everything.sh @@ -48,7 +48,9 @@ SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""} # fetch k8s API gen tools and make it available under kb_root_dir/bin. function fetch_kb_tools { - header_text "fetching tools" + local dest_dir="${1}" + + header_text "fetching tools (into '${dest_dir}')" kb_tools_archive_name="kubebuilder-tools-$k8s_version-$goos-$goarch.tar.gz" kb_tools_download_url="https://storage.googleapis.com/kubebuilder-tools/$kb_tools_archive_name" @@ -56,7 +58,9 @@ function fetch_kb_tools { if [ ! -f $kb_tools_archive_path ]; then curl -sL ${kb_tools_download_url} -o "$kb_tools_archive_path" fi - tar -zvxf "$kb_tools_archive_path" -C "$tmp_root/" + + mkdir -p "${dest_dir}" + tar -C "${dest_dir}" --strip-components=1 -zvxf "$kb_tools_archive_path" } function is_installed { @@ -78,7 +82,8 @@ header_text "using tools" if [ -z "$SKIP_FETCH_TOOLS" ]; then fetch_go_tools - fetch_kb_tools + fetch_kb_tools "$kb_root_dir" + fetch_kb_tools "${hack_dir}/../pkg/internal/testing/integration/assets" fi setup_envs diff --git a/pkg/internal/testing/.travis.yml b/pkg/internal/testing/.travis.yml deleted file mode 100644 index 248ba048c7..0000000000 --- a/pkg/internal/testing/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -language: go - -go: - - 1.13.x - -go_import_path: sigs.k8s.io/testing_frameworks - -before_install: - - source ./bin/consider-early-travis-exit.sh - - ./bin/install-test-dependencies.sh - -# Install must be set to prevent default `go get` to run. -# The dependencies have already been vendored by `dep` so -# we don't need to fetch them. -install: - - - -script: - - ./bin/pre-commit.sh - -# TBD. Suppressing for now. -notifications: - email: false diff --git a/pkg/internal/testing/CONTRIBUTING.md b/pkg/internal/testing/CONTRIBUTING.md deleted file mode 100644 index 181384bf72..0000000000 --- a/pkg/internal/testing/CONTRIBUTING.md +++ /dev/null @@ -1,13 +0,0 @@ -# Contributing guidelines - -## Sign the CLA - -Kubernetes projects require that you sign a Contributor License Agreement (CLA) before we can accept your pull requests. Please see https://git.k8s.io/community/CLA.md for more info - -### Contributing A Patch - -1. Submit an issue describing your proposed change to the repo in question. -1. The [repo owners](OWNERS) will respond to your issue promptly. -1. If your proposed change is accepted, and you haven't already done so, sign a Contributor License Agreement (see details above). -1. Fork the desired repo, develop and test your code changes. -1. Submit a pull request. diff --git a/pkg/internal/testing/LICENSE b/pkg/internal/testing/LICENSE deleted file mode 100644 index 538111e1e4..0000000000 --- a/pkg/internal/testing/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2018 The Kubernetes Authors - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/pkg/internal/testing/OWNERS b/pkg/internal/testing/OWNERS index 6b37fea824..6270f0ff50 100644 --- a/pkg/internal/testing/OWNERS +++ b/pkg/internal/testing/OWNERS @@ -1,5 +1,5 @@ # See the OWNERS docs: https://git.k8s.io/community/contributors/devel/owners.md approvers: - - sig-testing-leads - - frameworks-admins + - controller-runtime-admins + - testing-integration-admins diff --git a/pkg/internal/testing/OWNERS_ALIASES b/pkg/internal/testing/OWNERS_ALIASES deleted file mode 100644 index fc9e466e65..0000000000 --- a/pkg/internal/testing/OWNERS_ALIASES +++ /dev/null @@ -1,12 +0,0 @@ -# See the OWNERS docs: https://git.k8s.io/community/contributors/devel/owners.md - -aliases: - sig-testing-leads: - - fejta - - spiffxp - - stevekuznetsov - - timothysc - frameworks-admins: - - apelisse - - hoegaarden - - totherme diff --git a/pkg/internal/testing/README.md b/pkg/internal/testing/README.md deleted file mode 100644 index f5982af8da..0000000000 --- a/pkg/internal/testing/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Frameworks - -Test frameworks for testing kubernetes - -This was created as a result of [kubernetes/community#1524](https://github.com/kubernetes/community/pull/1524) - -## What lives here? - -- The [integration test framework](integration/) - -## What is allowed to live here? - -Any test framework for testing any part of kubernetes is welcome so long as we -can avoid vendor loops. - -Right now, the only things vendored into this repo are -[ginkgo](https://github.com/onsi/ginkgo) and -[gomega](https://github.com/onsi/gomega). We would like to keep vendored -libraries to a minimum in order to make it as easy as possible to import these -frameworks into other kubernetes repos. Code in this repo should certainly -never import `k8s.io/kubernetes`. diff --git a/pkg/internal/testing/SECURITY_CONTACTS b/pkg/internal/testing/SECURITY_CONTACTS deleted file mode 100644 index 739996628a..0000000000 --- a/pkg/internal/testing/SECURITY_CONTACTS +++ /dev/null @@ -1,15 +0,0 @@ -# Defined below are the security contacts for this repo. -# -# They are the contact point for the Product Security Team to reach out -# to for triaging and handling of incoming issues. -# -# The below names agree to abide by the -# [Embargo Policy](https://github.com/kubernetes/sig-release/blob/master/security-release-process-documentation/security-release-process.md#embargo-policy) -# and will be removed and replaced if they violate that agreement. -# -# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE -# INSTRUCTIONS AT https://kubernetes.io/security/ - -hoegaarden -spiffxp -timothysc diff --git a/pkg/internal/testing/bin/consider-early-travis-exit.sh b/pkg/internal/testing/bin/consider-early-travis-exit.sh deleted file mode 100644 index eea852bcf5..0000000000 --- a/pkg/internal/testing/bin/consider-early-travis-exit.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Exits with status 0 if it can be determined that the -# current PR should not trigger all travis checks. -# -# This could be done with a "git ...|grep -vqE" oneliner -# but as travis triggering is refined it's useful to check -# travis logs to see how branch files were considered. -function consider-early-travis-exit { - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - echo "Unknown pull request." - return - fi - # Might use this to improve checks on multi-commit PRs. - echo "TRAVIS_COMMIT_RANGE=$TRAVIS_COMMIT_RANGE" - echo "Branch Files ('T'==trigger tests, ' '=ignore):" - echo "---" - local triggers=0 - local invisibles=0 - for fn in $(git diff --name-only HEAD origin/master); do - if [[ "$fn" =~ (\.md$)|(^docs/) ]]; then - echo " $fn" - let invisibles+=1 - else - echo " T $fn" - let triggers+=1 - fi - done - echo "---" - printf >&2 "%6d files invisible to travis.\n" $invisibles - printf >&2 "%6d files trigger travis.\n" $triggers - if [ $triggers -eq 0 ]; then - echo "No files triggered travis test, exiting early." - # see https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/templates/header.sh - travis_terminate 0 - fi -} -consider-early-travis-exit -unset -f consider-early-travis-exit diff --git a/pkg/internal/testing/bin/install-test-dependencies.sh b/pkg/internal/testing/bin/install-test-dependencies.sh deleted file mode 100755 index 173f59a9d6..0000000000 --- a/pkg/internal/testing/bin/install-test-dependencies.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -u - -go get -u golang.org/x/tools/cmd/goimports diff --git a/pkg/internal/testing/bin/pre-commit.sh b/pkg/internal/testing/bin/pre-commit.sh deleted file mode 100755 index 79c7896907..0000000000 --- a/pkg/internal/testing/bin/pre-commit.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -# Make sure, we run in the root of the repo and -# therefore run the tests on all packages -base_dir="$( cd "$(dirname "$0")/.." && pwd )" -cd "$base_dir" || { - echo "Cannot cd to '$base_dir'. Aborting." >&2 - exit 1 -} - -rc=0 - -go_dirs() { - go list -f '{{.Dir}}' ./... | tr '\n' '\0' -} - -echo "Running go fmt" -diff <(echo -n) <(go_dirs | xargs -0 gofmt -s -d -l) -rc=$((rc || $?)) - -echo "Running goimports" -diff -u <(echo -n) <(go_dirs | xargs -0 goimports -l) -rc=$((rc || $?)) - -echo "Running go vet" -go vet -all ./... -rc=$((rc || $?)) - -echo "Installing test binaries" -./integration/scripts/download-binaries.sh -rc=$((rc || $?)) - -echo "Running go test" -go test -v ./... -rc=$((rc || $?)) - -exit $rc diff --git a/pkg/internal/testing/bin/test-on-prow.sh b/pkg/internal/testing/bin/test-on-prow.sh deleted file mode 100755 index 757cc5bf6a..0000000000 --- a/pkg/internal/testing/bin/test-on-prow.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -u - -export GO111MODULE=on -./bin/install-test-dependencies.sh -./bin/pre-commit.sh diff --git a/pkg/internal/testing/code-of-conduct.md b/pkg/internal/testing/code-of-conduct.md deleted file mode 100644 index 0d15c00cf3..0000000000 --- a/pkg/internal/testing/code-of-conduct.md +++ /dev/null @@ -1,3 +0,0 @@ -# Kubernetes Community Code of Conduct - -Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md) diff --git a/pkg/internal/testing/go.mod b/pkg/internal/testing/go.mod deleted file mode 100644 index 27df7fffb1..0000000000 --- a/pkg/internal/testing/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module sigs.k8s.io/testing_frameworks - -go 1.13 - -require ( - github.com/golang/protobuf v1.0.0 // indirect - github.com/kr/pretty v0.1.0 // indirect - github.com/onsi/ginkgo v1.4.0 - github.com/onsi/gomega v1.3.0 - golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b // indirect - golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect - golang.org/x/sys v0.0.0-20180117170059-2c42eef0765b // indirect - golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984 // indirect - gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect - gopkg.in/yaml.v2 v2.0.0 // indirect -) diff --git a/pkg/internal/testing/go.sum b/pkg/internal/testing/go.sum deleted file mode 100644 index 22716383dc..0000000000 --- a/pkg/internal/testing/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.0.0 h1:lsek0oXi8iFE9L+EXARyHIjU5rlWIhhTkjDz3vHhWWQ= -github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/onsi/ginkgo v1.4.0 h1:n60/4GZK0Sr9O2iuGKq876Aoa0ER2ydgpMOBwzJ8e2c= -github.com/onsi/ginkgo v1.4.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.3.0 h1:yPHEatyQC4jN3vdfvqJXG7O9vfC6LhaAV1NEdYpP+h0= -github.com/onsi/gomega v1.3.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b h1:Xu6Gf1IrU0c8CSJqWR43Bh8vb+Ft3jVIUahRiqL1oaI= -golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180117170059-2c42eef0765b h1:mxo/dXmtEd5rXc/ZzMKg0qDhMT+51+LvV65S9dP6nh4= -golang.org/x/sys v0.0.0-20180117170059-2c42eef0765b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984 h1:4S3Dic2vY09agWhKAjYa6buMB7HsLkVrliEHZclmmSU= -golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.0.0 h1:uUkhRGrsEyx/laRdeS6YIQKIys8pg+lRSRdVMTYjivs= -gopkg.in/yaml.v2 v2.0.0/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= diff --git a/pkg/internal/testing/integration/README.md b/pkg/internal/testing/integration/README.md index 6ad37397ff..5e2a052e86 100644 --- a/pkg/internal/testing/integration/README.md +++ b/pkg/internal/testing/integration/README.md @@ -1,5 +1,7 @@ # Integration Testing Framework +This package has been moved from [https://github.com/kubernetes-sigs/testing_frameworks/tree/master/integration](https://github.com/kubernetes-sigs/testing_frameworks/tree/master/integration). + A framework for integration testing components of kubernetes. This framework is intended to work properly both in CI, and on a local dev machine. It therefore explicitly supports both Linux and Darwin. diff --git a/pkg/internal/testing/integration/scripts/download-binaries.sh b/pkg/internal/testing/integration/scripts/download-binaries.sh deleted file mode 100755 index f9f142fea8..0000000000 --- a/pkg/internal/testing/integration/scripts/download-binaries.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash -set -eu - -# Use DEBUG=1 ./scripts/download-binaries.sh to get debug output -quiet="-s" -[[ -z "${DEBUG:-""}" ]] || { - set -x - quiet="" -} - -logEnd() { - local msg='done.' - [ "$1" -eq 0 ] || msg='Error downloading assets' - echo "$msg" -} -trap 'logEnd $?' EXIT - -# Use BASE_URL=https://my/binaries/url ./scripts/download-binaries to download -# from a different bucket -: "${BASE_URL:="https://storage.googleapis.com/k8s-c10s-test-binaries"}" - -test_framework_dir="$(cd "$(dirname "$0")/.." ; pwd)" -os="$(uname -s)" -os_lowercase="$(echo "$os" | tr '[:upper:]' '[:lower:]' )" -arch="$(uname -m)" - -dest_dir="${1:-"${test_framework_dir}/assets/bin"}" -etcd_dest="${dest_dir}/etcd" -kubectl_dest="${dest_dir}/kubectl" -kube_apiserver_dest="${dest_dir}/kube-apiserver" - -echo "About to download a couple of binaries. This might take a while..." - -curl $quiet "${BASE_URL}/etcd-${os}-${arch}" --output "$etcd_dest" -curl $quiet "${BASE_URL}/kube-apiserver-${os}-${arch}" --output "$kube_apiserver_dest" - -kubectl_version="$(curl $quiet https://storage.googleapis.com/kubernetes-release/release/stable.txt)" -kubectl_url="https://storage.googleapis.com/kubernetes-release/release/${kubectl_version}/bin/${os_lowercase}/amd64/kubectl" -curl $quiet "$kubectl_url" --output "$kubectl_dest" - -chmod +x "$etcd_dest" "$kubectl_dest" "$kube_apiserver_dest" - -echo "# destination:" -echo "# ${dest_dir}" -echo "# versions:" -echo -n "# etcd: "; "$etcd_dest" --version | head -n 1 -echo -n "# kube-apiserver: "; "$kube_apiserver_dest" --version -echo -n "# kubectl: "; "$kubectl_dest" version --client --short