Merge pull request #980 from jichenjc/test_gate

k8s-ci-robot · web-flow · commit 4e178f080c88 · 2021-08-30T00:38:53.000-07:00
fix gate lint issue
diff --git a/api/v1alpha3/zz_generated.conversion.go b/api/v1alpha3/zz_generated.conversion.go
diff --git a/api/v1alpha3/zz_generated.deepcopy.go b/api/v1alpha3/zz_generated.deepcopy.go
diff --git a/api/v1alpha4/zz_generated.deepcopy.go b/api/v1alpha4/zz_generated.deepcopy.go
diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py
@@ -204,7 +204,7 @@ def get_regexs():
     # company holder names can be anything
     regexs["date"] = re.compile(get_dates())
     # strip // +build \n\n build constraints
-    regexs["go_build_constraints"] = re.compile(r"^(// \+build.*\n)+\n", re.MULTILINE)
+    regexs["go_build_constraints"] = re.compile(r"^(//go:build.*\n)^(// \+build.*\n)+\n", re.MULTILINE)
     # strip #!.* from shell scripts
     regexs["shebang"] = re.compile(r"^(#!.*\n)\n*", re.MULTILINE)
     # Search for generated files
diff --git a/hack/tools/tools.go b/hack/tools/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 /*
diff --git a/test/e2e/shared/cluster.go b/test/e2e/shared/cluster.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/shared/common.go b/test/e2e/shared/common.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/shared/context.go b/test/e2e/shared/context.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/shared/defaults.go b/test/e2e/shared/defaults.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/shared/exec.go b/test/e2e/shared/exec.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/shared/exec_test.go b/test/e2e/shared/exec_test.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/shared/openstack.go b/test/e2e/shared/openstack.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/shared/openstack_test.go b/test/e2e/shared/openstack_test.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/shared/suite.go b/test/e2e/shared/suite.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/suites/conformance/conformance_suite_test.go b/test/e2e/suites/conformance/conformance_suite_test.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/suites/conformance/conformance_test.go b/test/e2e/suites/conformance/conformance_test.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/suites/e2e/e2e_suite_test.go b/test/e2e/suites/e2e/e2e_suite_test.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*
diff --git a/test/e2e/suites/e2e/e2e_test.go b/test/e2e/suites/e2e/e2e_test.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build tools`
`1`	`2`	`// +build tools`
`2`	`3`
`3`	`4`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build e2e`
`1`	`2`	`// +build e2e`
`2`	`3`
`3`	`4`	`/*`