lastCompletedBuild for [Jenkins] badges and better discoverability

services/jenkins/jenkins-build.service.js

@@ -84,7 +84,7 @@ module.exports = class JenkinsBuild extends JenkinsBase {
 
   async handle({ protocol, host, job }, { disableStrictSSL }) {
     const json = await this.fetch({
-      url: buildUrl({ protocol, host, job, lastBuild: false }),
+      url: buildUrl({ protocol, host, job, lastCompletedBuild: false }),
       schema,
       qs: buildTreeParamQueryString('color'),
       disableStrictSSL,

services/jenkins/jenkins-build.tester.js

@@ -12,7 +12,7 @@ const isJenkinsBuildStatus = Joi.alternatives(
 )
 
 t.create('build job not found')
-  .get('/https/updates.jenkins-ci.org/job/does-not-exist.json')
+  .get('/https/ci.eclipse.org/jgit/job/does-not-exist.json')
   .expectBadge({ label: 'build', message: 'instance or job not found' })
 
 t.create('build found (view)')
@@ -22,7 +22,7 @@ t.create('build found (view)')
   .expectBadge({ label: 'build', message: isJenkinsBuildStatus })
 
 t.create('build found (job)')
-  .get('/https/jenkins.ubuntu.com/server/curtin-vmtest-daily-x.json')
+  .get('/https/ci.eclipse.org/jgit/job/jgit.json')
   .expectBadge({ label: 'build', message: isJenkinsBuildStatus })
 
 const user = 'admin'

services/jenkins/jenkins-common.js

@@ -6,10 +6,16 @@ const queryParamSchema = Joi.object({
   disableStrictSSL: Joi.equal(''),
 }).required()
 
-const buildUrl = ({ protocol, host, job, lastBuild = true, plugin }) => {
+const buildUrl = ({
+  protocol,
+  host,
+  job,
+  lastCompletedBuild = true,
+  plugin,
+}) => {
   const jobPrefix = job.indexOf('/') > -1 ? '' : 'job/'
   return `${protocol}://${host}/${jobPrefix}${job}/${
-    lastBuild ? 'lastBuild/' : ''
+    lastCompletedBuild ? 'lastCompletedBuild/' : ''
   }${plugin ? `${plugin}/` : ''}api/json`
 }
 

services/jenkins/jenkins-coverage.service.js

@@ -73,6 +73,7 @@ module.exports = class JenkinsCoverage extends JenkinsBase {
           host: 'jenkins.sqlalchemy.org',
           job: 'job/alembic_coverage',
         },
+        keywords: ['jacoco', 'cobertura'],
         staticPreview: this.render({ coverage: 95 }),
       },
     ]

services/jenkins/jenkins-coverage.tester.js

@@ -10,18 +10,16 @@ const t = (module.exports = require('../tester').createServiceTester())
 
 t.create('jacoco: job found')
   .get('/jacoco/https/wso2.org/jenkins/view/All%20Builds/job/archetypes.json')
-  .timeout(10000)
   .expectBadge({ label: 'coverage', message: isIntegerPercentage })
 
 t.create('jacoco: job not found')
-  .get('/jacoco/https/updates.jenkins-ci.org/job/does-not-exist.json')
+  .get('/jacoco/https/wso2.org/jenkins/job/does-not-exist.json')
   .expectBadge({ label: 'coverage', message: 'job or coverage not found' })
 
 t.create('cobertura: job not found')
-  .get('/cobertura/https/updates.jenkins-ci.org/job/does-not-exist.json')
+  .get('/cobertura/https/jenkins.sqlalchemy.org/job/does-not-exist.json')
   .expectBadge({ label: 'coverage', message: 'job or coverage not found' })
 
 t.create('cobertura: job found')
   .get('/cobertura/https/jenkins.sqlalchemy.org/alembic_coverage.json')
-  .timeout(10000)
   .expectBadge({ label: 'coverage', message: isIntegerPercentage })

services/jenkins/jenkins-tests.service.js

@@ -22,7 +22,7 @@ const {
 //
 // Sample data set for the `actions` array:
 // "actions":[{"_class":"hudson.model.ParametersAction"},{"_class":"hudson.model.CauseAction"},{"_class":"hudson.tasks.junit.TestResultAction","failCount":15,"skipCount":0,"totalCount":753},{},{}]
-// https://jenkins.qa.ubuntu.com/view/Trusty/view/Smoke%20Testing/job/trusty-touch-flo-smoke-daily/lastBuild/api/json?tree=actions[failCount,skipCount,totalCount]
+// https://jenkins.qa.ubuntu.com/view/Trusty/view/Smoke%20Testing/job/trusty-touch-flo-smoke-daily/lastCompletedBuild/api/json?tree=actions[failCount,skipCount,totalCount]
 const schema = Joi.object({
   actions: Joi.array()
     .items(

services/jenkins/jenkins-tests.tester.js

@@ -59,9 +59,9 @@ t.create('Test status with compact message and custom labels')
   })
 
 t.create('Test status on job with no tests')
-  .get('/https/jenkins.ubuntu.com/server/job/curtin-vmtest-daily-x.json')
+  .get('/https/ci.eclipse.org/openj9/job/Build-Doc-Push_to_ghpages.json')
   .expectBadge({ label: 'tests', message: 'no tests found' })
 
 t.create('Test status on non-existent job')
-  .get('/https/updates.jenkins-ci.org/job/does-not-exist.json')
+  .get('/https/ci.eclipse.org/openj9/job/does-not-exist.json')
   .expectBadge({ label: 'tests', message: 'instance or job not found' })