root
/
kubevela
mirror of https://github.com/kubevela/kubevela.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix e2e-setup 

revert commented e2e cases

Signed-off-by: roy wang <seiwy2010@gmail.com>
This commit is contained in:
roy wang 2020-10-13 21:02:37 +09:00
parent 48404bde98
commit ad819b354a
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -78,7 +78,7 @@ docker-push:
e2e-setup:
ginkgo version
ginkgo -v -r e2e/setup
# kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
bin/vela dashboard &
e2e-test:

12
e2e/application/application_test.go
View File

@ -13,7 +13,7 @@ var (
workloadType = "webservice"
applicationName = "app-basic"
traitAlias = "scale"
// appNameForInit = "initmyapp"
appNameForInit = "initmyapp"
)
var _ = ginkgo.Describe("Application", func() {
@ -26,11 +26,9 @@ var _ = ginkgo.Describe("Application", func() {
e2e.ComponentListContext("comp ls", applicationName, "")
e2e.TraitManualScalerAttachContext("vela attach scale trait", traitAlias, applicationName)
e2e.ApplicationShowContext("app show", applicationName, workloadType)
//TODO(roywang) get this case back when fix e2e setup runtime pod issue
// e2e.ApplicationStatusContext("app status", applicationName, workloadType)
// e2e.ApplicationCompStatusContext("comp status", applicationName, workloadType, envName)
// e2e.ApplicationInitIntercativeCliContext("init", appNameForInit, workloadType)
e2e.ApplicationStatusContext("app status", applicationName, workloadType)
e2e.ApplicationCompStatusContext("comp status", applicationName, workloadType, envName)
e2e.ApplicationInitIntercativeCliContext("init", appNameForInit, workloadType)
e2e.WorkloadDeleteContext("delete", applicationName)
//TODO(roywang) get this case back when fix e2e setup runtime pod issue
// e2e.WorkloadDeleteContext("delete", appNameForInit)
e2e.WorkloadDeleteContext("delete", appNameForInit)
})

2
e2e/cli.go
View File

@ -75,7 +75,7 @@ func InteractiveExec(cli string, consoleFn func(*expect.Console)) (string, error
command.Stdin = console.Tty()
session, err := gexec.Start(command, console.Tty(), console.Tty())
s := session.Wait(30 * time.Second)
s := session.Wait(90 * time.Second)
console.Tty().Close()
<-doneC
if err != nil {

2
e2e/commonContext.go
View File

@ -203,7 +203,7 @@ var (
appConfig := &corev1alpha2.ApplicationConfiguration{}
_ = k8sclient.Get(ctx.Background(), client.ObjectKey{Name: applicationName, Namespace: "default"}, appConfig)
return len(appConfig.Status.Workloads)
}, 120*time.Second, 1*time.Second).ShouldNot(gomega.Equal(0))
}, 90*time.Second, 1*time.Second).ShouldNot(gomega.Equal(0))
cli := fmt.Sprintf("vela comp status %s", applicationName)
output, err := LongTimeExec(cli, 120*time.Second)