зеркало из https://github.com/Azure/acs-engine.git
E2E: retry kubectl delete job (#3981)
This commit is contained in:
Родитель
c6ce5d3914
Коммит
7b7e997597
|
@ -161,13 +161,23 @@ func (j *Job) WaitOnReady(sleep, duration time.Duration) (bool, error) {
|
|||
}
|
||||
|
||||
// Delete will delete a Job in a given namespace
|
||||
func (j *Job) Delete() error {
|
||||
func (j *Job) Delete(retries int) error {
|
||||
var kubectlOutput []byte
|
||||
var kubectlError error
|
||||
for i := 0; i < retries; i++ {
|
||||
cmd := exec.Command("kubectl", "delete", "job", "-n", j.Metadata.Namespace, j.Metadata.Name)
|
||||
util.PrintCommand(cmd)
|
||||
out, err := cmd.CombinedOutput()
|
||||
if err != nil {
|
||||
log.Printf("Error while trying to delete Job %s in namespace %s:%s\n", j.Metadata.Namespace, j.Metadata.Name, string(out))
|
||||
return err
|
||||
kubectlOutput, kubectlError = cmd.CombinedOutput()
|
||||
if kubectlError != nil {
|
||||
log.Printf("Error while trying to delete Job %s in namespace %s:%s\n", j.Metadata.Namespace, j.Metadata.Name, string(kubectlOutput))
|
||||
continue
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
if kubectlError != nil {
|
||||
return kubectlError
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -265,7 +265,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
|
|||
j, err := job.CreateJobFromFile(filepath.Join(WorkloadDir, "validate-dns.yaml"), "validate-dns", "default")
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
ready, err := j.WaitOnReady(5*time.Second, cfg.Timeout)
|
||||
delErr := j.Delete()
|
||||
delErr := j.Delete(10)
|
||||
if delErr != nil {
|
||||
fmt.Printf("could not delete job %s\n", j.Metadata.Name)
|
||||
fmt.Println(delErr)
|
||||
|
@ -824,7 +824,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
|
|||
j, err := job.CreateJobFromFile(filepath.Join(WorkloadDir, "cuda-vector-add.yaml"), "cuda-vector-add", "default")
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
ready, err := j.WaitOnReady(30*time.Second, cfg.Timeout)
|
||||
delErr := j.Delete()
|
||||
delErr := j.Delete(10)
|
||||
if delErr != nil {
|
||||
fmt.Printf("could not delete job %s\n", j.Metadata.Name)
|
||||
fmt.Println(delErr)
|
||||
|
@ -835,7 +835,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
|
|||
j, err := job.CreateJobFromFile(filepath.Join(WorkloadDir, "nvidia-smi.yaml"), "nvidia-smi", "default")
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
ready, err := j.WaitOnReady(30*time.Second, cfg.Timeout)
|
||||
delErr := j.Delete()
|
||||
delErr := j.Delete(10)
|
||||
if delErr != nil {
|
||||
fmt.Printf("could not delete job %s\n", j.Metadata.Name)
|
||||
fmt.Println(delErr)
|
||||
|
|
Загрузка…
Ссылка в новой задаче