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

Merge pull request #28959 from asalkeld/e2e-isup

Browse Source 
Automatic merge from submit-queue

e2e.go --isup should also check the version

Just move the setenv up to include --isup

fixes #18667
This commit is contained in:
k8s-merge-robot 2016-07-22 01:59:18 -07:00 committed by GitHub
commit be5e98fafd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/e2e.go
View File

@ -75,6 +75,8 @@ func main() {
log.SetFlags(log.LstdFlags | log.Lshortfile)
flag.Parse()
os.Setenv("KUBECTL", *root+`/cluster/kubectl.sh`+kubectlArgs())
if *isup {
status := 1
if IsUp() {
@ -96,8 +98,6 @@ func main() {
}
}
os.Setenv("KUBECTL", *root+`/cluster/kubectl.sh`+kubectlArgs())
if *pushup {
if IsUp() {
log.Printf("e2e cluster is up, pushing.")