Skip to content

Ignore Jenkins builds not related to pull requests #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phillipj merged 1 commit into from
Jun 9, 2018
Merged

Ignore Jenkins builds not related to pull requests #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions scripts/jenkins-status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ function isJenkinsIpWhitelisted (req) {
return true
}

function isRelatedToPullRequest (gitRef) {
// refs/pull/12345/head vs refs/heads/v8.x-staging/head
return gitRef.includes('/pull/')
}

module.exports = function (app) {
app.post('/:repo/jenkins/start', (req, res) => {
const isValid = pushJenkinsUpdate.validate(req.body)
Expand All @@ -25,6 +30,10 @@ module.exports = function (app) {
return res.status(400).end('Invalid payload')
}

if (!isRelatedToPullRequest(req.body.ref)) {
return res.status(400).end('Will only push builds related to pull requests')
}

if (!enabledRepos.includes(repo)) {
return res.status(400).end('Invalid repository')
}
Expand Down
8 changes: 8 additions & 0 deletions test/_fixtures/jenkins-staging-failure-payload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"identifier": "node-test-commit-aix",
"status": "failure",
"message": "tests failed",
"commit": "084ef6016994a41ffbbe9e48584abe874a197d43",
"url": "https://ci.nodejs.org/job/node-test-commit-aix/15657/",
"ref": "refs/heads/v8.x-staging"
}
17 changes: 17 additions & 0 deletions test/integration/push-jenkins-update.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,23 @@ tap.test('Responds with 400 / "Bad request" when incoming request has invalid pa
})
})

tap.test('Responds with 400 / "Bad request" when incoming request is not related to a pull request', (t) => {
const fixture = readFixture('jenkins-staging-failure-payload.json')

// don't care about the results, just want to prevent any HTTP request ever being made
nock('https://api.github.com')

t.plan(1)

supertest(app)
.post('/node/jenkins/start')
.send(fixture)
.expect(400, 'Will only push builds related to pull requests')
.end((err, res) => {
t.equal(err, null)
})
})

tap.test('Responds with 400 / "Bad request" when incoming providing invalid repository name', (t) => {
const fixture = readFixture('pending-payload.json')

Expand Down