diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-03 17:10:30 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-03 17:10:30 +0100 |
commit | 5c8c3467906d996c04210cc8350edbd027ccc32a (patch) | |
tree | b0d34eb87cd589b27b422059eff599b3b80ba24e /src/main/java/io/trygvis/esper/testing/core/jenkins | |
parent | 35ba1a6f765f72a1d91a5456c7556e6274f8c3a9 (diff) | |
download | esper-testing-5c8c3467906d996c04210cc8350edbd027ccc32a.tar.gz esper-testing-5c8c3467906d996c04210cc8350edbd027ccc32a.tar.bz2 esper-testing-5c8c3467906d996c04210cc8350edbd027ccc32a.tar.xz esper-testing-5c8c3467906d996c04210cc8350edbd027ccc32a.zip |
o Skipping builds where the job is a <mavenModule>.
o Using the build's timestamp instead of createdDate in the UI.
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/core/jenkins')
-rwxr-xr-x | src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java b/src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java index 3270db1..4689e4d 100755 --- a/src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java +++ b/src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java @@ -42,10 +42,35 @@ public class JenkinsBuildPoller implements TablePoller.NewRowCallback<JenkinsBui Daos daos = new Daos(c); final BuildDao buildDao = daos.buildDao; + JenkinsJobDto jobDto = daos.jenkinsDao.selectJob(jenkinsBuild.job).get(); + + SqlOption<InputStream> jobXmlFileO = daos.fileDao.load(jobDto.file); + + if (jobXmlFileO.isNone()) { + logger.warn("Job xml file unavailable: File.uuid={}", jobDto.file); + return; + } + + Option<JenkinsJobXml> jobXmlO = xmlParser.parseDocument.f(jobXmlFileO.get()). + bind(JenkinsJobXml.parse); + + if (jobXmlO.isNone()) { + logger.warn("Could not parse job file: File.uuid={}", jobDto.file); + return; + } + + JenkinsJobXml jobXml = jobXmlO.some(); + + switch (jobXml.type) { + case MAVEN_MODULE: + logger.info("Skipping maven module, Job.uuid={}", jobDto.uuid); + return; + } + SqlOption<InputStream> file = daos.fileDao.load(jenkinsBuild.file); if (file.isNone()) { - logger.warn("File unavailable: " + jenkinsBuild.file); + logger.warn("Build file unavailable: " + jenkinsBuild.file); return; } @@ -78,6 +103,7 @@ public class JenkinsBuildPoller implements TablePoller.NewRowCallback<JenkinsBui // This happens if no one has claimed the user id. if (personO.isNone()) { + logger.info("unknown person: " + user); unknownPersons++; continue; } @@ -91,7 +117,5 @@ public class JenkinsBuildPoller implements TablePoller.NewRowCallback<JenkinsBui logger.info("Created build uuid={}, #participants={}, #knownPersons={}, #unknonwnPersons={}", uuidBuild, jenkinsBuild.users.length, knownPersons, unknownPersons); - - throw new SQLException("wat"); } } |