refine clean logic (#719)

pingcap · Aug 5, 2019 · c348598 · c348598
1 parent 6b9cc3a
commit c348598
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/tests/actions.go b/tests/actions.go
@@ -619,6 +619,12 @@ func (oa *operatorActions) CleanTidbCluster(info *TidbClusterConfig) error {
 
 	setStr := label.New().Instance(info.ClusterName).String()
 
+	// delete all jobs
+	allJobsSet := label.Label{}.Instance(info.ClusterName).String()
+	if res, err := exec.Command("kubectl", "delete", "jobs", "-n", info.Namespace, "-l", allJobsSet).CombinedOutput(); err != nil {
+		return fmt.Errorf("failed to delete jobs: %v, %s", err, string(res))
+	}
+
 	resources := []string{"pvc"}
 	for _, resource := range resources {
 		if res, err := exec.Command("kubectl", "delete", resource, "-n", info.Namespace, "-l",
@@ -627,12 +633,6 @@ func (oa *operatorActions) CleanTidbCluster(info *TidbClusterConfig) error {
 		}
 	}
 
-	// delete all jobs
-	allJobsSet := label.Label{}.Instance(info.ClusterName).String()
-	if res, err := exec.Command("kubectl", "delete", "jobs", "-n", info.Namespace, "-l", allJobsSet).CombinedOutput(); err != nil {
-		return fmt.Errorf("failed to delete jobs: %v, %s", err, string(res))
-	}
-
 	// delete all configmaps
 	allConfigMaps := label.New().Instance(info.ClusterName).String()
 	if res, err := exec.Command("kubectl", "delete", "configmaps", "-n", info.Namespace, "-l", allConfigMaps).CombinedOutput(); err != nil {