[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
kubernetes-sigs · Dec 6, 2019 · 8a6a7f2 · 8a6a7f2
1 parent 56c5ea7
commit 8a6a7f2
Show file tree

Hide file tree

Showing 20 changed files with 16 additions and 471 deletions.
diff --git 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
@@ -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
@@ -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
@@ -48,15 +48,19 @@ 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"
 
   kb_tools_archive_path="$tmp_root/$kb_tools_archive_name"
   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
diff --git a/pkg/internal/testing/CONTRIBUTING.md b/pkg/internal/testing/CONTRIBUTING.md
diff --git a/pkg/internal/testing/LICENSE b/pkg/internal/testing/LICENSE
diff --git 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
diff --git a/pkg/internal/testing/README.md b/pkg/internal/testing/README.md
diff --git a/pkg/internal/testing/SECURITY_CONTACTS b/pkg/internal/testing/SECURITY_CONTACTS
diff --git a/pkg/internal/testing/bin/consider-early-travis-exit.sh b/pkg/internal/testing/bin/consider-early-travis-exit.sh
diff --git a/pkg/internal/testing/bin/install-test-dependencies.sh b/pkg/internal/testing/bin/install-test-dependencies.sh