jobs/bodhi-trigger: fix CI retrigger message handling

jlebon · jlebon · commit 7cd7fe81107b · 2024-02-05T14:39:28.000-05:00
Missed removing this bit from 4509014 ("jobs/bodhi-trigger: simplify triggering").
diff --git a/jobs/bodhi-trigger.Jenkinsfile b/jobs/bodhi-trigger.Jenkinsfile
@@ -72,9 +72,7 @@ properties([
                 // Is this for an SRPM we care about? The jsonpath expression
                 // here evaluates to "all builds of type rpm whose nvr matches
                 // 'n-v-r' where 'n' is one of those in $srpms".
-                [field: "\$.update.builds[?(@.type == 'rpm' && @.nvr =~ /^(${srpms.join("|")})-[^-]+-[^-]+\$/)]", expectedValue: '^\\[.+\\]$'],
-                // We handle the retrigger case separately below.
-                [field: '$.re-trigger', expectedValue: '^false$']
+                [field: "\$.update.builds[?(@.type == 'rpm' && @.nvr =~ /^(${srpms.join("|")})-[^-]+-[^-]+\$/)]", expectedValue: '^\\[.+\\]$']
             ]
         )
       ]

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,7 @@ properties([`
`72`	`72`	`// Is this for an SRPM we care about? The jsonpath expression`
`73`	`73`	`// here evaluates to "all builds of type rpm whose nvr matches`
`74`	`74`	`// 'n-v-r' where 'n' is one of those in $srpms".`
`75`		`- [field: "\$.update.builds[?(@.type == 'rpm' && @.nvr =~ /^(${srpms.join("\|")})-[^-]+-[^-]+\$/)]", expectedValue: '^\\[.+\\]$'],`
`76`		`- // We handle the retrigger case separately below.`
`77`		`- [field: '$.re-trigger', expectedValue: '^false$']`
	`75`	`+ [field: "\$.update.builds[?(@.type == 'rpm' && @.nvr =~ /^(${srpms.join("\|")})-[^-]+-[^-]+\$/)]", expectedValue: '^\\[.+\\]$']`
`78`	`76`	`]`
`79`	`77`	`)`
`80`	`78`	`]`