control-service:better cleanup after test completes

Signed-off-by: mrMoZ1 <[email protected]>
vmware · May 23, 2023 · 0d42355 · 0d42355
1 parent 9e42fdf
commit 0d42355
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/...ice/src/integration-test/java/com/vmware/taurus/datajobs/it/TestJobDeployTempCredsIT.java b/...ice/src/integration-test/java/com/vmware/taurus/datajobs/it/TestJobDeployTempCredsIT.java
@@ -207,14 +207,7 @@ public void testDeployment() throws Exception {
   }
 
   @AfterEach
-  public void cleanUp() throws Exception {
-    mockMvc
-        .perform(
-            delete(
-                    String.format(
-                        "/data-jobs/for-team/%s/jobs/%s/sources", TEST_TEAM_NAME, TEST_JOB_NAME))
-                .with(user("user")))
-        .andExpect(status().isOk());
+  public void deleteImage() {
 
     // delete repository and images
     DeleteRepositoryRequest request =
@@ -224,4 +217,15 @@ public void cleanUp() throws Exception {
 
     ecrClient.deleteRepository(request);
   }
+
+  @AfterEach
+  public void deleteDataJob() throws Exception {
+    mockMvc
+        .perform(
+            delete(
+                String.format(
+                    "/data-jobs/for-team/%s/jobs/%s", TEST_TEAM_NAME, TEST_JOB_NAME))
+                .with(user("user")))
+        .andExpect(status().isOk());
+  }
 }