opendev/system-config
Code Issues Proposed changes

Double the gerrit regex backslashes

Browse Source 
The current amount of backslashes is not good enough for gerrit, and it
rejects the config file. Probably related to futureparser? In any case,
we need doubled-backslashes in the generated file, so 4 backslashes does
the right thing in the puppet.

Change-Id: I950b8efbcb876b2d1309f1117626a41ef22025b0
This commit is contained in:
Monty Taylor 2018-09-27 08:15:57 -05:00
parent 45c427838a
commit dfe891af3e
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/manifests/gerrit.pp
View File

@ -158,13 +158,13 @@ class openstack_project::gerrit (
{ {
name => 'storyboard-story', name => 'storyboard-story',
footer => 'story:', footer => 'story:',
match => '\\#?(\\d+)', match => '\\\\#?(\\\\d+)',
system => 'Storyboard', system => 'Storyboard',
}, },
{ {
name => 'storyboard-task', name => 'storyboard-task',
footer => 'task:', footer => 'task:',
match => '\\#?(\\d+)', match => '\\\\#?(\\\\d+)',
system => 'Storyboard', system => 'Storyboard',
}, },
], ],

14
modules/openstack_project/manifests/review.pp
View File

@ -142,27 +142,27 @@ class openstack_project::review (
commentlinks => [ commentlinks => [
{ {
name => 'bugheader', name => 'bugheader',
match => '([Cc]loses|[Pp]artial|[Rr]elated)-[Bb]ug:\\s*#?(\\d+)', match => '([Cc]loses|[Pp]artial|[Rr]elated)-[Bb]ug:\\\\s*#?(\\\\d+)',
link => 'https://launchpad.net/bugs/$2', link => 'https://launchpad.net/bugs/$2',
}, },
{ {
name => 'bug', name => 'bug',
match => '\\b[Bb]ug:? #?(\\d+)', match => '\\\\b[Bb]ug:? #?(\\\\d+)',
link => 'https://launchpad.net/bugs/$1', link => 'https://launchpad.net/bugs/$1',
}, },
{ {
name => 'story', name => 'story',
match => '\\b[Ss]tory:? #?(\\d+)', match => '\\\\b[Ss]tory:? #?(\\\\d+)',
link => 'https://storyboard.openstack.org/#!/story/$1', link => 'https://storyboard.openstack.org/#!/story/$1',
}, },
{ {
name => 'its-storyboard', name => 'its-storyboard',
match => '\\b[Tt]ask:? #?(\\d+)', match => '\\\\b[Tt]ask:? #?(\\\\d+)',
link => 'task: $1', link => 'task: $1',
}, },
{ {
name => 'blueprint', name => 'blueprint',
match => '(\\b[Bb]lue[Pp]rint\\b|\\b[Bb][Pp]\\b)[ \\t#:]*([A-Za-z0-9\\-]+)', match => '(\\\\b[Bb]lue[Pp]rint\\\\b|\\\\b[Bb][Pp]\\\\b)[ \\\\t#:]*([A-Za-z0-9\\\\-]+)',
link => 'https://blueprints.launchpad.net/openstack/?searchtext=$2', link => 'https://blueprints.launchpad.net/openstack/?searchtext=$2',
}, },
{ {
@ -177,7 +177,7 @@ class openstack_project::review (
}, },
{ {
name => 'launchpadbug', name => 'launchpadbug',
match => '<a href=\"(https://bugs\\.launchpad\\.net/[a-zA-Z0-9\\-]+/\\+bug/(\\d+))[^\"]*\">[^<]+</a>', match => '<a href=\"(https://bugs\\\\.launchpad\\\\.net/[a-zA-Z0-9\\\\-]+/\\\\+bug/(\\\\d+))[^\"]*\">[^<]+</a>',
html => '<a href=\"$1\">$1</a>' html => '<a href=\"$1\">$1</a>'
}, },
{ {
@ -187,7 +187,7 @@ class openstack_project::review (
}, },
{ {
name => 'gitsha', name => 'gitsha',
match => '(<p>|[\\s(])([0-9a-f]{40})(</p>|[\\s.,;:)])', match => '(<p>|[\\\\s(])([0-9a-f]{40})(</p>|[\\\\s.,;:)])',
html => '$1<a href=\"/#/q/$2\">$2</a>$3', html => '$1<a href=\"/#/q/$2\">$2</a>$3',
}, },
], ],

14
modules/openstack_project/manifests/review_dev.pp
View File

@ -89,27 +89,27 @@ class openstack_project::review_dev (
commentlinks => [ commentlinks => [
{ {
name => 'bugheader', name => 'bugheader',
match => '([Cc]loses|[Pp]artial|[Rr]elated)-[Bb]ug:\\s*#?(\\d+)', match => '([Cc]loses|[Pp]artial|[Rr]elated)-[Bb]ug:\\\\s*#?(\\\\d+)',
link => 'https://launchpad.net/bugs/$2', link => 'https://launchpad.net/bugs/$2',
}, },
{ {
name => 'bug', name => 'bug',
match => '\\b[Bb]ug:? #?(\\d+)', match => '\\\\b[Bb]ug:? #?(\\\\d+)',
link => 'https://launchpad.net/bugs/$1', link => 'https://launchpad.net/bugs/$1',
}, },
{ {
name => 'story', name => 'story',
match => '\\b[Ss]tory:? #?(\\d+)', match => '\\\\b[Ss]tory:? #?(\\\\d+)',
link => 'https://storyboard-dev.openstack.org/#!/story/$1', link => 'https://storyboard-dev.openstack.org/#!/story/$1',
}, },
{ {
name => 'its-storyboard', name => 'its-storyboard',
match => '\\b[Tt]ask:? #?(\\d+)', match => '\\\\b[Tt]ask:? #?(\\\\d+)',
link => 'task: $1', link => 'task: $1',
}, },
{ {
name => 'blueprint', name => 'blueprint',
match => '(\\b[Bb]lue[Pp]rint\\b|\\b[Bb][Pp]\\b)[ \\t#:]*([A-Za-z0-9\\-]+)', match => '(\\\\b[Bb]lue[Pp]rint\\\\b|\\\\b[Bb][Pp]\\\\b)[ \\\\t#:]*([A-Za-z0-9\\\\-]+)',
link => 'https://blueprints.launchpad.net/openstack/?searchtext=$2', link => 'https://blueprints.launchpad.net/openstack/?searchtext=$2',
}, },
{ {
@ -119,7 +119,7 @@ class openstack_project::review_dev (
}, },
{ {
name => 'launchpadbug', name => 'launchpadbug',
match => '<a href=\"(https://bugs\\.launchpad\\.net/[a-zA-Z0-9\\-]+/\\+bug/(\\d+))[^\"]*\">[^<]+</a>', match => '<a href=\"(https://bugs\\\\.launchpad\\\\.net/[a-zA-Z0-9\\\\.]+/\\\\+bug/(\\\\d+))[^\"]*\">[^<]+</a>',
html => '<a href=\"$1\">$1</a>' html => '<a href=\"$1\">$1</a>'
}, },
{ {
@ -129,7 +129,7 @@ class openstack_project::review_dev (
}, },
{ {
name => 'gitsha', name => 'gitsha',
match => '(<p>|[\\s(])([0-9a-f]{40})(</p>|[\\s.,;:)])', match => '(<p>|[\\\\s(])([0-9a-f]{40})(</p>|[\\\\s.,;:)])',
html => '$1<a href=\"/#/q/$2\">$2</a>$3', html => '$1<a href=\"/#/q/$2\">$2</a>$3',
}, },
], ],