- NEXUS-301 - Automated Plugin For Releasing is Releasing too Many Re…

…positories
dhladky · Apr 21, 2020 · 7f0f5c3 · 7f0f5c3
1 parent 8f53a7e
commit 7f0f5c3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.sonatype.nexus.plugins</groupId>
         <artifactId>nexus-plugins</artifactId>
-        <version>2.14.16-01</version>
+        <version>2.14.17-01</version>
     </parent>
 
     <scm>
@@ -58,14 +58,14 @@
       </dependency>
 
       <!-- Needs to be added to Maven manually aka:
-        mvn install:install-file -Dfile=nexus-staging-plugin-2.14.16-01.jar -DgroupId=com.sonatype.nexus.plugins -DartifactId=nexus-staging-plugin -Dversion=2.14.16-01 -Dpackaging=jar -DgeneratePom=true
+        mvn install:install-file -Dfile=nexus-staging-plugin-2.14.17-01.jar -DgroupId=com.sonatype.nexus.plugins -DartifactId=nexus-staging-plugin -Dversion=2.14.17-01 -Dpackaging=jar -DgeneratePom=true
       -->
       <dependency>
           <groupId>com.sonatype.nexus.plugins</groupId>
           <artifactId>nexus-staging-plugin</artifactId>
           <version>${project.version}</version>
           <scope>provided</scope>
-          <type>${nexus-plugin.type}</type>     <!-- -->
+          <type>${nexus-plugin.type}</type>    <!--  -->
       </dependency>
 
       <dependency>

diff --git a/src/main/java/com/redhat/nexus/releasestagingrepositories/task/CleanUpTask.java b/src/main/java/com/redhat/nexus/releasestagingrepositories/task/CleanUpTask.java
@@ -14,6 +14,7 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Iterator;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -60,6 +61,27 @@ protected String doRun() throws Exception {
         if(reposToPromote.size() > 0) {
            try {
                stagingManager.promoteStagingRepositories(reposToPromote, getParameter(CleanUpTaskDescriptor.FLD_DESCRIPTION), Boolean.parseBoolean(getParameter(CleanUpTaskDescriptor.FLD_AUTOMATIC_DROP)));
+
+               while (true) {
+                   synchronized (this){
+                       wait(60000);
+                   }
+
+                   Iterator<String> iterator = reposToPromote.iterator();
+                   while (iterator.hasNext()) {
+                       String repo = iterator.next();
+                       if(!stagingManager.isTransitioning(repo)) {
+                           iterator.remove(); // processed
+                       }
+                   }
+
+                   if(reposToPromote.isEmpty()) {
+                       logger.info("Automatic release of " + profileId +" finished.");
+                       break;
+                   } else {
+                       logger.info("Automatic release of "+ profileId + " is running: "+reposToPromote.size()+" repositories to process.");
+                   }
+               }
            } catch (Exception e) {
                logger.error("Error promoting repositories: ", e.getMessage());
            }