PR#73: Fix: Catch only requested messages - c3i-library

c3i-library

#73 Fix: Catch only requested messages

Merged 4 years ago by mkovarik. Opened 4 years ago by mkovarik.

mkovarik/c3i-library regex-fedmsg into master

Fix: Catch only requested messages

Michal Kovarik • 4 years ago

ecef33d

roles/c3i/templates/build-workflow/build-pagure.Jenkinsfile

file modified

+3 -3

		`@@ -38,11 +38,11 @@`
		`overrides: [topic: "{{ topic }}"],`
		`checks: [`
		`{% if "premerge" == job_vars.workflow %}`
		`- [field: '$.pullrequest.project.url_path', expectedValue: params.GIT_REPO.split('/')[3..-1].join('/').replace('forks/', 'fork/').replaceAll(/.git$/, '')],`
		`- [field: '$.pullrequest.branch', expectedValue: params.GIT_MAIN_BRANCH],`
		`+ [field: '$.pullrequest.project.url_path', expectedValue: "^${params.GIT_REPO.split('/')[3..-1].join('/').replace('forks/', 'fork/').replaceAll(/.git$/, '')}\$"],`
		`+ [field: '$.pullrequest.branch', expectedValue: "^${params.GIT_MAIN_BRANCH}\$"],`
		`{% elif "job-updater" == job_vars.workflow %}`
		`[field: '$.repo.url_path', expectedValue: "^${params.GIT_REPO.split('/')[3..-1].join('/').replace('forks/', 'fork/').replaceAll(/.git$/, '')}\$"],`
		`- [field: '$.branch', expectedValue: params.GIT_MAIN_BRANCH],`
		`+ [field: '$.branch', expectedValue: "^${params.GIT_MAIN_BRANCH}\$"],`
		`{% endif %}`
		`]`
		`),`

verification/c3i-role-verification.Jenkinsfile

file modified

+8 -8

		`@@ -27,32 +27,32 @@`
		`name: params.MESSAGING_FEDMSG_PROVIDER,`
		`overrides: [topic: "io.pagure.prod.pagure.pull-request.new"],`
		`checks: [`
		`- [field: '$.pullrequest.project.url_path', expectedValue: params.GIT_REPO.split('/')[3..-1].join('/').replace('forks/', 'fork/').replaceAll(/.git$/, '')],`
		`- [field: '$.pullrequest.branch', expectedValue: params.GIT_MAIN_BRANCH],`
		`+ [field: '$.pullrequest.project.url_path', expectedValue: "^${params.GIT_REPO.split('/')[3..-1].join('/').replace('forks/', 'fork/').replaceAll(/.git$/, '')}\$"],`
		`+ [field: '$.pullrequest.branch', expectedValue: "^${params.GIT_MAIN_BRANCH}\$"],`
		`]`
		`),`
		`fedmsgSubscriber(`
		`name: params.MESSAGING_FEDMSG_PROVIDER,`
		`overrides: [topic: "io.pagure.prod.pagure.pull-request.update"],`
		`checks: [`
		`- [field: '$.pullrequest.project.url_path', expectedValue: params.GIT_REPO.split('/')[3..-1].join('/').replace('forks/', 'fork/').replaceAll(/.git$/, '')],`
		`- [field: '$.pullrequest.branch', expectedValue: params.GIT_MAIN_BRANCH],`
		`+ [field: '$.pullrequest.project.url_path', expectedValue: "^${params.GIT_REPO.split('/')[3..-1].join('/').replace('forks/', 'fork/').replaceAll(/.git$/, '')}\$"],`
		`+ [field: '$.pullrequest.branch', expectedValue: "^${params.GIT_MAIN_BRANCH}\$"],`
		`]`
		`),`
		`fedmsgSubscriber(`
		`name: params.MESSAGING_FEDMSG_PROVIDER,`
		`overrides: [topic: "io.pagure.prod.pagure.pull-request.reopened"],`
		`checks: [`
		`- [field: '$.pullrequest.project.url_path', expectedValue: params.GIT_REPO.split('/')[3..-1].join('/').replace('forks/', 'fork/').replaceAll(/.git$/, '')],`
		`- [field: '$.pullrequest.branch', expectedValue: params.GIT_MAIN_BRANCH],`
		`+ [field: '$.pullrequest.project.url_path', expectedValue: "^${params.GIT_REPO.split('/')[3..-1].join('/').replace('forks/', 'fork/').replaceAll(/.git$/, '')}\$"],`
		`+ [field: '$.pullrequest.branch', expectedValue: "^${params.GIT_MAIN_BRANCH}\$"],`
		`]`
		`),`
		`fedmsgSubscriber(`
		`name: params.MESSAGING_FEDMSG_PROVIDER,`
		`overrides: [topic: "io.pagure.prod.pagure.pull-request.rebased"],`
		`checks: [`
		`- [field: '$.pullrequest.project.url_path', expectedValue: params.GIT_REPO.split('/')[3..-1].join('/').replace('forks/', 'fork/').replaceAll(/.git$/, '')],`
		`- [field: '$.pullrequest.branch', expectedValue: params.GIT_MAIN_BRANCH],`
		`+ [field: '$.pullrequest.project.url_path', expectedValue: "^${params.GIT_REPO.split('/')[3..-1].join('/').replace('forks/', 'fork/').replaceAll(/.git$/, '')}\$"],`
		`+ [field: '$.pullrequest.branch', expectedValue: "^${params.GIT_MAIN_BRANCH}\$"],`
		`]`
		`),`
		`]`