"deleting the repository with retries"

Author: nitinp19

.github/workflows/tests.yml

@@ -30,10 +30,6 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - name: Set unique Artifactory home
-        run: echo "ARTIFACTORY_HOME=$(mktemp -d)" >> $GITHUB_ENV
-
-
       - name: Setup Go with cache
         uses: jfrog/.github/actions/install-go-with-cache@main
 

services/src/test/groovy/org/jfrog/artifactory/client/BaseRepositoryTests.groovy

@@ -58,6 +58,7 @@ abstract class BaseRepositoryTests extends ArtifactoryTestsBase {
     @BeforeMethod
     protected void setUp() {
         String id = Long.toString(repoUniqueId)
+        println "[SETUP] Starting test setup for repo id: $id at ${new Date()}"
         if (prepareGenericRepo) {
             RepositorySettings settings = getRepositorySettings(RepositoryTypeImpl.LOCAL)
 
@@ -177,11 +178,11 @@ abstract class BaseRepositoryTests extends ArtifactoryTestsBase {
     @AfterMethod
     protected void tearDown() {
         // Invoking sequence is important! Delete in reverse dependency order
-        deleteRepoIfExists(virtualRepo?.getKey())      // Delete virtual repo first (depends on generic)
-        deleteRepoIfExists(federatedRepo?.getKey())
-        deleteRepoIfExists(remoteRepo?.getKey())
-        deleteRepoIfExists(localRepo?.getKey())
-        deleteRepoIfExists(genericRepo?.getKey())      // Delete generic repo last (after dependents)
+        deleteRepoWithRetry(virtualRepo?.getKey())      // Delete virtual repo first (depends on generic)
+        deleteRepoWithRetry(federatedRepo?.getKey())
+        deleteRepoWithRetry(remoteRepo?.getKey())
+        deleteRepoWithRetry(localRepo?.getKey())
+        deleteRepoWithRetry(genericRepo?.getKey())      // Delete generic repo last (after dependents)
         repoUniqueId++
     }
 

services/src/test/java/org/jfrog/artifactory/client/ArtifactoryTestsBase.java

@@ -26,7 +26,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Properties;
-import java.util.logging.Logger;
 
 import static org.apache.commons.codec.binary.Base64.encodeBase64;
 import static org.apache.commons.lang3.StringUtils.isEmpty;
@@ -56,7 +55,6 @@ public abstract class ArtifactoryTestsBase {
     protected VirtualRepository virtualRepository;
     protected RemoteRepository remoteRepository;
     protected String federationUrl;
-    private static final Logger logger = Logger.getLogger(ArtifactoryTestsBase.class.getName());
 
     @BeforeClass
     public void init() throws IOException {
@@ -213,31 +211,23 @@ protected String textFrom(InputStream is) throws IOException {
     protected void deleteRepoWithRetry(String repoKey) {
         for (int attempt = 1; attempt <= 3; attempt++) {
             try {
-                logger.info("Attempt " + attempt + " to delete repo: " + repoKey);
                 deleteRepoIfExists(repoKey);
-                logger.info("Successfully deleted repo: " + repoKey + " on attempt " + attempt);
                 return;
             } catch (RuntimeException e) {
                 Throwable cause = e.getCause();
-                logger.warning("Attempt " + attempt + " failed to delete repo: " + repoKey + ". Reason: " + e.getMessage());
                 if (cause instanceof HttpResponseException &&
                         ((HttpResponseException) cause).getStatusCode() == 500 &&
                         cause.getMessage() != null && cause.getMessage().contains("Lock on LockEntryId")) {
 
                     if (attempt < 3) {
-                        logger.info("Lock detected. Retrying after 5 seconds...");
                         try {
                             Thread.sleep(5000);
                         } catch (InterruptedException ie) {
                             Thread.currentThread().interrupt();
-                            logger.warning("Retry interrupted while waiting to retry repo deletion: " + repoKey);
                             return;
                         }
-                    } else {
-                        logger.severe("Failed to delete repo after 3 attempts due to lock: " + repoKey);
                     }
                 } else {
-                    logger.severe("Non-lock error occurred. Not retrying. Repo: " + repoKey);
                     return; // Non-lock error, don't retry
                 }
             }