Skip to content

Commit

Permalink
e2e/framework: remove imports to pkg/controller/job
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
  • Loading branch information
andrewsykim committed Mar 17, 2020
1 parent 426e5dc commit 6c7bb45
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
1 change: 0 additions & 1 deletion test/e2e/framework/job/BUILD
Expand Up @@ -11,7 +11,6 @@ go_library(
importpath = "k8s.io/kubernetes/test/e2e/framework/job",
visibility = ["//visibility:public"],
deps = [
"//pkg/controller/job:go_default_library",
"//staging/src/k8s.io/api/batch/v1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
Expand Down
15 changes: 13 additions & 2 deletions test/e2e/framework/job/wait.go
Expand Up @@ -20,12 +20,12 @@ import (
"context"
"time"

batchv1 "k8s.io/api/batch/v1"
"k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
jobutil "k8s.io/kubernetes/pkg/controller/job"
"k8s.io/kubernetes/test/e2e/framework"
)

Expand Down Expand Up @@ -65,10 +65,21 @@ func WaitForJobFinish(c clientset.Interface, ns, jobName string) error {
if err != nil {
return false, err
}
return jobutil.IsJobFinished(curr), nil

return isJobFinished(curr), nil
})
}

func isJobFinished(j *batchv1.Job) bool {
for _, c := range j.Status.Conditions {
if (c.Type == batchv1.JobComplete || c.Type == batchv1.JobFailed) && c.Status == v1.ConditionTrue {
return true
}
}

return false
}

// WaitForJobGone uses c to wait for up to timeout for the Job named jobName in namespace ns to be removed.
func WaitForJobGone(c clientset.Interface, ns, jobName string, timeout time.Duration) error {
return wait.Poll(framework.Poll, timeout, func() (bool, error) {
Expand Down

0 comments on commit 6c7bb45

Please sign in to comment.