github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88941 from dims/add-version-command-line-parameter

Browse Source 
Add version flag to e2e.test
This commit is contained in:
Kubernetes Prow Robot 2020-03-18 22:23:11 -07:00 committed by GitHub
commit b52f703d2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/BUILD
View File

@ -5,6 +5,7 @@ load(
go_test = "go_test_conditional_pure", go_test = "go_test_conditional_pure",
) )
load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//go:def.bzl", "go_library")
load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs")
go_test( go_test(
name = "go_default_test", name = "go_default_test",
@ -15,7 +16,9 @@ go_test(
out = "e2e.test", out = "e2e.test",
embed = [":go_default_library"], embed = [":go_default_library"],
tags = ["e2e"], tags = ["e2e"],
x_defs = version_x_defs(),
deps = [ deps = [
"//staging/src/k8s.io/component-base/version:go_default_library",
"//test/e2e/apimachinery:go_default_library", "//test/e2e/apimachinery:go_default_library",
"//test/e2e/apps:go_default_library", "//test/e2e/apps:go_default_library",
"//test/e2e/auth:go_default_library", "//test/e2e/auth:go_default_library",

8
test/e2e/e2e_test.go
View File

@ -30,6 +30,7 @@ import (
// See https://github.com/kubernetes/kubernetes/issues/74827 // See https://github.com/kubernetes/kubernetes/issues/74827
// "github.com/onsi/ginkgo" // "github.com/onsi/ginkgo"
"k8s.io/component-base/version"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/framework/config" "k8s.io/kubernetes/test/e2e/framework/config"
"k8s.io/kubernetes/test/e2e/framework/testfiles" "k8s.io/kubernetes/test/e2e/framework/testfiles"
@ -68,6 +69,9 @@ func handleFlags() {
} }
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
var versionFlag bool
flag.CommandLine.BoolVar(&versionFlag, "version", false, "Displays version information.")
// Register test flags, then parse flags. // Register test flags, then parse flags.
handleFlags() handleFlags()
@ -85,6 +89,10 @@ func TestMain(m *testing.M) {
} }
os.Exit(0) os.Exit(0)
} }
if versionFlag {
fmt.Printf("%s\n", version.Get())
os.Exit(0)
}
framework.AfterReadingAllFlags(&framework.TestContext) framework.AfterReadingAllFlags(&framework.TestContext)