Parcourir la source

fix: debug change image tag to reduce duplicated image on nexus and change job update waiting time to 1 min

claws il y a 4 ans
Parent
commit
f3f30e0337

+ 2 - 2
api/src/main/java/cn/seecoder/api/k8s/impl/JobApiImpl.java

@@ -63,8 +63,8 @@ public class JobApiImpl implements JobApi {
     public Job update(Job job) {
         delete(job);
         try {
-            LoggerUtil.info(logger, "waiting 10s...");
-            Thread.sleep(10000);
+            LoggerUtil.info(logger, "waiting 1min...");
+            Thread.sleep(60000);
             LoggerUtil.info(logger, "10s has gone");
         } catch (InterruptedException e) {
             e.printStackTrace();

+ 2 - 2
web/src/main/java/cn/seecoder/web/core/pipeline/handler/SonarJavaImageBuildHandler.java

@@ -60,7 +60,7 @@ public class SonarJavaImageBuildHandler extends AbstractHandler {
         // 0. prepare
         String templateName = PipelineTemplateTable.SONAR_JAVA8;
         String imageName = context.getNamespace() + '-' + context.getDeployName() + "-sonar";
-        String imageTag = String.valueOf(new Date().getTime());
+//        String imageTag = String.valueOf(new Date().getTime());
         ProjectVO project = projectService.getProjectById(projectId);
         if (project == null) {
             throw new PipelineException(HttpStatus.SC_SERVICE_UNAVAILABLE, PipelineException.PROJECT_NOT_FOUND_ERROR);
@@ -81,7 +81,7 @@ public class SonarJavaImageBuildHandler extends AbstractHandler {
              commitHash = branch.getCommit().getId();
              isBranch = true;
         }
-
+        String imageTag = commitHash;
         String sonarProjectKey = String.format("%s-%s", imageName, commitHash); //TODO
         String loginToken = applicationProperties.getSonar().getLoginToken();
         String sonarHost = applicationProperties.getSonar().getHost();