1
0
Azure 2 лет назад
Родитель
Сommit
288e7b3160

+ 7 - 6
seecoder-build-server/src/main/java/cn/seecoder/build/server/service/facade/jenkins/impl/JenkinsApiImpl.java

@@ -99,19 +99,20 @@ public class JenkinsApiImpl implements JenkinsApi {
     @Override
     public BuildWithDetails fetchBuildDetails(String jobName, int buildNumber, boolean waitFinished) throws ServiceException {
         try {
-            BuildWithDetails build;
-            build = server.getJob(jobName).getBuildByNumber(buildNumber).details();
-            while (waitFinished && (build.getResult() == null || build.getDuration() == 0)) {
+            BuildWithDetails buildWithDetails;
+            Build build =server.getJob(jobName).getBuildByNumber(buildNumber);
+            buildWithDetails = build.getClient().get(build.getUrl().replace("build-jenkins.internal-paas.seec.seecoder.cn","environment-9-12.seec.svc.cluster.local:8080"), BuildWithDetails.class);
+            while (waitFinished && (buildWithDetails.getResult() == null || buildWithDetails.getDuration() == 0)) {
                 try {
                     Thread.sleep(500);
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
                 }
-                build = server.getJob(jobName).getBuildByNumber(buildNumber).details();
+                buildWithDetails = build.getClient().get(build.getUrl().replace("build-jenkins.internal-paas.seec.seecoder.cn","environment-9-12.seec.svc.cluster.local:8080"), BuildWithDetails.class);
             }
-            return build;
+            return buildWithDetails;
         } catch (IOException e) {
-            logger.error("fetchBuildDetails exception={}, jobName={}, buildNumber={}, waitFinished", e, jobName, buildNumber, waitFinished);
+            logger.error("fetchBuildDetails exception={}, jobName={}, buildNumber={}, waitFinished", e.getMessage(), jobName, buildNumber, waitFinished);
             throw new ServiceException("101", e.getMessage());
         }
     }