diff --git a/services/jenkins/jenkins-build.service.js b/services/jenkins/jenkins-build.service.js index f776949ebb029..83ddd8a3b9f48 100644 --- a/services/jenkins/jenkins-build.service.js +++ b/services/jenkins/jenkins-build.service.js @@ -18,6 +18,7 @@ module.exports = class JenkinsBuild extends LegacyService { static get route() { return { base: 'jenkins/s', + pattern: ':scheme(http|https)?/:host/:job*', } } @@ -25,8 +26,18 @@ module.exports = class JenkinsBuild extends LegacyService { return [ { title: 'Jenkins', - previewUrl: - 'https/jenkins.qa.ubuntu.com/view/Precise/view/All%20Precise/job/precise-desktop-amd64_default', + pattern: ':scheme/:host/:job', + namedParams: { + scheme: 'https', + host: 'jenkins.qa.ubuntu.com', + job: + 'view/Precise/view/All%20Precise/job/precise-desktop-amd64_default', + }, + staticPreview: { + label: 'build', + message: 'passing', + color: 'brightgreen', + }, }, ] } diff --git a/services/jenkins/jenkins-plugin-installs.tester.js b/services/jenkins/jenkins-plugin-installs.tester.js index d03d12ca8b5ca..96a8932e892b2 100644 --- a/services/jenkins/jenkins-plugin-installs.tester.js +++ b/services/jenkins/jenkins-plugin-installs.tester.js @@ -16,42 +16,10 @@ t.create('total installs | valid') }) ) -t.create('total installs | invalid: no "installations" property') - .get('/view-job-filters.json') - .intercept(nock => - nock('https://stats.jenkins.io') - .get('/plugin-installation-trend/view-job-filters.stats.json') - .reply(200, { name: 'view-job-filters' }) - ) - .expectJSON({ name: 'installs', value: 'invalid response data' }) - -t.create('total installs | invalid: empty "installations" object') - .get('/view-job-filters.json') - .intercept(nock => - nock('https://stats.jenkins.io') - .get('/plugin-installation-trend/view-job-filters.stats.json') - .reply(200, { name: 'view-job-filters', installations: {} }) - ) - .expectJSON({ name: 'installs', value: 'invalid response data' }) - -t.create('total installs | invalid: non-numeric "installations" key') - .get('/view-job-filters.json') - .intercept(nock => - nock('https://stats.jenkins.io') - .get('/plugin-installation-trend/view-job-filters.stats.json') - .reply(200, { name: 'view-job-filters', installations: { abc: 12345 } }) - ) - .expectJSON({ name: 'installs', value: 'invalid response data' }) - t.create('total installs | not found') .get('/not-a-plugin.json') .expectJSON({ name: 'installs', value: 'plugin not found' }) -t.create('total installs | inaccessible: connection error') - .get('/view-job-filters.json') - .networkOff() - .expectJSON({ name: 'installs', value: 'inaccessible' }) - // version installs t.create('version installs | valid: numeric version') @@ -72,24 +40,6 @@ t.create('version installs | valid: alphanumeric version') }) ) -t.create('version installs | invalid: "installationsPerVersion" missing') - .get('/view-job-filters/1.26.json') - .intercept(nock => - nock('https://stats.jenkins.io') - .get('/plugin-installation-trend/view-job-filters.stats.json') - .reply(200, { name: 'view-job-filters' }) - ) - .expectJSON({ name: 'installs', value: 'invalid response data' }) - -t.create('version installs | invalid: empty "installationsPerVersion" object') - .get('/view-job-filters/1.26.json') - .intercept(nock => - nock('https://stats.jenkins.io') - .get('/plugin-installation-trend/view-job-filters.stats.json') - .reply(200, { name: 'view-job-filters', installationsPerVersion: {} }) - ) - .expectJSON({ name: 'installs', value: 'invalid response data' }) - t.create('version installs | not found: non-existent plugin') .get('/not-a-plugin/1.26.json') .expectJSON({ name: 'installs', value: 'plugin not found' }) @@ -97,10 +47,3 @@ t.create('version installs | not found: non-existent plugin') t.create('version installs | not found: non-existent version') .get('/view-job-filters/1.1-NOT-FOUND.json') .expectJSON({ name: 'installs', value: 'version not found' }) - -t.create('version installs | inaccessible: connection error') - .get('/view-job-filters/1.26.json') - .networkOff() - .expectJSON({ name: 'installs', value: 'inaccessible' }) - -module.exports = t diff --git a/services/jenkins/jenkins-plugin-version.service.js b/services/jenkins/jenkins-plugin-version.service.js index 1579a6b9b29e9..5bfabb8c073ea 100644 --- a/services/jenkins/jenkins-plugin-version.service.js +++ b/services/jenkins/jenkins-plugin-version.service.js @@ -27,7 +27,15 @@ module.exports = class JenkinsPlugin extends LegacyService { return [ { title: 'Jenkins Plugins', - previewUrl: 'blueocean', + pattern: ':plugin', + namedParams: { + plugin: 'blueocean', + }, + staticPreview: { + label: 'plugin', + message: 'v1.10.1', + color: 'blue', + }, }, ] } diff --git a/services/jenkins/jenkins-tests.service.js b/services/jenkins/jenkins-tests.service.js index 3262bfef4889d..6884e72b7af38 100644 --- a/services/jenkins/jenkins-tests.service.js +++ b/services/jenkins/jenkins-tests.service.js @@ -18,6 +18,7 @@ module.exports = class JenkinsTests extends LegacyService { static get route() { return { base: 'jenkins/t', + pattern: ':scheme(http|https)?/:host/:job*', } } @@ -25,8 +26,18 @@ module.exports = class JenkinsTests extends LegacyService { return [ { title: 'Jenkins tests', - previewUrl: - 'https/jenkins.qa.ubuntu.com/view/Precise/view/All%20Precise/job/precise-desktop-amd64_default', + pattern: ':scheme/:host/:job', + namedParams: { + scheme: 'https', + host: 'jenkins.qa.ubuntu.com', + job: + 'view/Precise/view/All%20Precise/job/precise-desktop-amd64_default', + }, + staticPreview: { + label: 'build', + message: 'passing', + color: 'brightgreen', + }, }, ] }