mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 06:27:05 +00:00
Merge pull request #2783 from zmerlynn/IsUp
Check if cluster is up before e2e test without -up
This commit is contained in:
commit
0166649364
12
hack/e2e.go
12
hack/e2e.go
@ -70,7 +70,7 @@ func main() {
|
|||||||
|
|
||||||
if *isup {
|
if *isup {
|
||||||
status := 1
|
status := 1
|
||||||
if runBash("get status", `$KUBECFG -server_version`) {
|
if IsUp() {
|
||||||
status = 0
|
status = 0
|
||||||
log.Printf("Cluster is UP")
|
log.Printf("Cluster is UP")
|
||||||
} else {
|
} else {
|
||||||
@ -130,12 +130,22 @@ func Up() bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Is the e2e cluster up?
|
||||||
|
func IsUp() bool {
|
||||||
|
return runBash("get status", `$KUBECFG -server_version`)
|
||||||
|
}
|
||||||
|
|
||||||
func tryUp() bool {
|
func tryUp() bool {
|
||||||
return runBash("up", path.Join(*root, "/cluster/kube-up.sh; test-setup;"))
|
return runBash("up", path.Join(*root, "/cluster/kube-up.sh; test-setup;"))
|
||||||
}
|
}
|
||||||
|
|
||||||
func Test() (failed, passed []string) {
|
func Test() (failed, passed []string) {
|
||||||
defer runBashUntil("watchEvents", "$KUBECTL --watch-only get events")()
|
defer runBashUntil("watchEvents", "$KUBECTL --watch-only get events")()
|
||||||
|
|
||||||
|
if !IsUp() {
|
||||||
|
log.Fatal("Testing requested, but e2e cluster not up!")
|
||||||
|
}
|
||||||
|
|
||||||
// run tests!
|
// run tests!
|
||||||
dir, err := os.Open(filepath.Join(*root, "hack", "e2e-suite"))
|
dir, err := os.Open(filepath.Join(*root, "hack", "e2e-suite"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user